X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fcontrol.c;h=a90bb713dfa846f9df2775b347180f8a6290d7f4;hb=4728997cb5f6eff94c8a9d9e253d1675b7516987;hp=1a768e6ca9d2d84f5b3932a7424c9a1bd6201178;hpb=6c51c5f6242dbf1ba8f9355aab512d4b28a75012;p=bike-lights.git

diff --git a/firmware/control.c b/firmware/control.c
index 1a768e6..a90bb71 100644
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -30,17 +30,23 @@ static pattern_t panic_pattern[] = {
 };
 
 pattern_t on1_pattern [] = {
-	{ 1, 0x10 },
+	{ 1, 0x7 },
 	PATTERN_END
 };
 
 static pattern_t on2_pattern [] = {
-	{ 2, 0x10 },
+	{ 2, 0x7 },
 	PATTERN_END
 };
 
 static pattern_t on3_pattern [] = {
-	{ 3, 0x10 },
+	{ 3, 0x7 },
+	PATTERN_END
+};
+
+static pattern_t brake_pattern [] = {
+	{ 4, 0x2 },
+	{ 3, 0x7 },
 	PATTERN_END
 };
 
@@ -48,11 +54,11 @@ static pattern_t normal2_pattern[] = {
 	{ 2, 0x1 },
 	{ 0, 0x1 },
 	{ 2, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	{ 1, 0x1 },
 	{ 0, 0x1 },
 	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
@@ -60,11 +66,11 @@ static pattern_t normal3_pattern[] = {
 	{ 3, 0x1 },
 	{ 0, 0x1 },
 	{ 3, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	{ 1, 0x1 },
 	{ 0, 0x1 },
 	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
@@ -72,38 +78,58 @@ static pattern_t normal4_pattern[] = {
 	{ 4, 0x1 },
 	{ 0, 0x1 },
 	{ 4, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	{ 1, 0x1 },
 	{ 0, 0x1 },
 	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
 static pattern_t slow1_pattern[] = {
 	{ 1, 0x01 },
-	{ 0, 0x10 },
+	{ 0, 0x7 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
 static pattern_t slow2_pattern[] = {
 	{ 2, 0x01 },
-	{ 0, 0x10 },
+	{ 0, 0x7 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
 static pattern_t slow3_pattern[] = {
 	{ 3, 0x01 },
-	{ 0, 0x10 },
+	{ 0, 0x7 },
+	{ 0, 0x7 },
 	PATTERN_END
 };
 
-static unsigned char dim_mode, towbar_mode;
+static unsigned char dim_mode, towbar_mode, braking;
 
 void init_control()
 {
 	dim_mode = 0;
 	towbar_mode = 0;
+	braking = 0;
+}
+
+void brake_on()
+{
+	braking = 1;
+	gpio_set(0, 1);
+	led_set_pattern(N_PWMLEDS, status_led_pattern_select());
+	led_set_pattern(0, pwmled0_pattern_select());
+}
+
+void brake_off()
+{
+	braking = 0;
+	gpio_set(0, 0);
+	led_set_pattern(N_PWMLEDS, status_led_pattern_select());
+	led_set_pattern(0, pwmled0_pattern_select());
 }
 
 void toggle_dim_mode()
@@ -124,15 +150,19 @@ void set_panic_mode()
 
 pattern_t *pwmled0_pattern_select()
 {
-	// TODO: battery critical
+	if (battery_critical)
+		return on1_pattern;
 
 	if (towbar_mode)
 		return NULL;
 
+	if (braking)
+		return brake_pattern;
+
 	switch (ambient_zone) {
-	case 0: return dim_mode ? NULL : on3_pattern;
-	case 1: return dim_mode ? NULL : normal3_pattern;
-	case 2: return dim_mode ? slow3_pattern : normal3_pattern;
+	case 0: return dim_mode ? NULL : number_pattern(2, 1);
+	case 1: return dim_mode ? slow1_pattern : normal2_pattern;
+	case 2: return dim_mode ? slow2_pattern : normal3_pattern;
 	case 3:
 	default: return dim_mode ? slow3_pattern : normal4_pattern;
 	}
@@ -140,10 +170,11 @@ pattern_t *pwmled0_pattern_select()
 
 pattern_t *pwmled1_pattern_select()
 {
-	// TODO: battery critical
-
 #ifndef TESTING_FW
 	return NULL;
+#else
+	if (battery_critical)
+		return on1_pattern;
 #endif
 
 	if (towbar_mode) {
@@ -168,11 +199,11 @@ pattern_t *pwmled1_pattern_select()
 
 pattern_t *pwmled2_pattern_select()
 {
-	// TODO: battery critical
-
 #ifndef TESTING_FW
-	return on3_pattern;
+	if (battery_critical)
+		return on1_pattern;
 #endif
+
 	switch (ambient_zone) {
 	case 0: return dim_mode ? on2_pattern : on3_pattern;
 	case 1: return dim_mode ? slow1_pattern : normal2_pattern;
@@ -185,6 +216,9 @@ pattern_t *pwmled2_pattern_select()
 
 pattern_t *status_led_pattern_select()
 {
+	if (braking)
+		return on1_pattern;
+
 	if (buttons_setup_in_progress())
 		return buttons_setup_status0_pattern_select();
 
@@ -194,7 +228,8 @@ pattern_t *status_led_pattern_select()
 
 pattern_t *illumination_led_pattern_select()
 {
-	// todo: battery critical
+	if (battery_critical)
+		return NULL;
 
 	switch (ambient_zone) {
 	case 0: return dim_mode