X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Flights.h;h=49bb94c5a38091991d4c0ac57f2adcd90020f80b;hp=9d0386878bf9b79ff774a1e6de929ee74f6cb2f2;hb=a58c5b9c16ec9060c38a14446e5524b22ad8aea5;hpb=6621404f62ab1071575ab2bbb984075e7bf1dee5

diff --git a/firmware/lights.h b/firmware/lights.h
index 9d03868..49bb94c 100644
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -2,6 +2,7 @@
 #define LIGHTS_H__ 1
 
 #define TESTING_FW 1
+#define PAVLINA 1	// settings for my wife's bike
 
 #define N_LEDS 4
 #define N_STATUS_LED 1
@@ -77,10 +78,11 @@ void gpio_set(unsigned char n, unsigned char on);
 
 /* ambient.c */
 #define AMBIENT_ADC_SHIFT 0	/* 1 measurement per callback */
+#define N_AMBIENT_ZONES 4
 void init_ambient();
 void susp_ambient();
 void ambient_log_min_max();
-extern volatile unsigned char ambient_zone;
+extern volatile unsigned char ambient_zone, ambient_shadow;
 void ambient_adc(uint16_t adc_val);
 
 /* pattern.c */
@@ -111,7 +113,7 @@ void pattern_reload();
 void pwmleds_update_mode();
 
 /* buttons.c */
-#define MAX_USER_PARAMS 3
+#define N_USER_PARAMS 3
 void init_buttons();
 void susp_buttons();
 void timer_check_buttons();
@@ -123,14 +125,24 @@ pattern_t *buttons_setup_status0_pattern_select();
 pattern_t *buttons_setup_status1_pattern_select();
 
 /* battery.c */
-extern volatile unsigned char battery_critical;
 void battery_adc();
 void init_battery();
 unsigned char battery_gauge();
 
 /* control.c */
 extern pattern_t on_pattern[];
-extern volatile unsigned char braking;
+typedef union {
+	unsigned char any_flag;
+	struct {
+		unsigned char booting : 1;
+		unsigned char braking : 1;
+		unsigned char err_battery : 1;
+		unsigned char err_pwmled0 : 1;
+		unsigned char err_pwmled1 : 1;
+		unsigned char err_pwmled2 : 1;
+	};
+} err_flags_t;
+extern volatile err_flags_t err_flags;
 
 void init_control();
 void brake_on();