Common patterns rewrite

[bike-lights.git] / firmware / lights.h

diff --git a/firmware/lights.h b/firmware/lights.h
index 72b719b321eaff5907a604ef2c0f2b7d528cf013..26f7372988d00bff323654f41adea2459581b59f 100644 (file)
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -3,21 +3,25 @@
 
 #define TESTING_FW 1
 
-#define N_LEDS 7
+#define N_LEDS 4
+#define N_STATUS_LED 1
+#define N_ILLUM_LED 2
+#define N_LASER_LED 4
+
 #define N_PWMLEDS 3
-#define N_PWMLED_MODES 4
+#define N_PWMLED_MODES 3
 
 #define N_BUTTONS 2
 
 /* logging.c */
 #ifdef USE_LOGGING
-void init_log();
+void init_log(unsigned char mcusr);
 void log_set_state(unsigned char val);
 void log_flush();
 void log_byte(unsigned char byte);
 void log_word(uint16_t word);
 #else
-void inline init_log() { }
+void inline init_log(unsigned char mcusr) { }
 void inline log_set_state(unsigned char val) { }
 void inline log_flush() { }
 void inline log_byte(unsigned char byte) { }
@@ -29,6 +33,7 @@ void inline log_word(uint16_t word) { }
 void init_adc();
 void susp_adc();
 void timer_start_slow_adcs();
+extern volatile unsigned char adc_is_on;
 
 /* pwm.c */
 /*
@@ -56,6 +61,14 @@ void susp_tmr();
 void init_pwmled();
 void pwmled_adc(unsigned char n, uint16_t adcval);
 void pwmled_set_mode(unsigned char n, unsigned char mode);
+void pwmled_set_brightness(uint16_t brightness);
+#define PWMLED_BRIGHTNESS(l0_lo, l0_hi, l1, l2_lo, l2_hi) ( \
+          (uint16_t)(l0_lo) \
+       | ((uint16_t)(l0_hi) << 3) \
+       | ((uint16_t)(l1)    << 6) \
+       | ((uint16_t)(l2_lo) << 9) \
+       | ((uint16_t)(l2_hi) << 12) \
+       )
 
 /* gpio.c */
 void init_gpio();
@@ -72,11 +85,24 @@ void ambient_adc(uint16_t adc_val);
 
 /* pattern.c */
 typedef struct {
-       unsigned char mode: 3;
-       unsigned char duration: 5;
+       unsigned char mode: 5;
+       unsigned char duration_fib: 3;
 } pattern_t;
 
 #define PATTERN_END { 0, 0 }
+#define D_1 1
+#define D_2 2
+#define D_3 3
+#define D_5 4
+#define D_8 5
+#define D_13 6
+#define D_21 7
+
+#define PWM_PAT(L2, L1, L0)    ( \
+       (((L2) & 3) << 3) | \
+       (((L1) & 1) << 2) | \
+       (((L0) & 3)) )
+
 void init_pattern();
 void patterns_next_tick();
 void led_set_pattern(unsigned char led, pattern_t *pattern);
@@ -102,22 +128,20 @@ void init_battery();
 unsigned char battery_gauge();
 
 /* control.c */
-extern pattern_t on1_pattern[];
+extern pattern_t on_pattern[];
 
 void init_control();
 void brake_on();
 void brake_off();
 void toggle_dim_mode();
 void set_panic_mode();
-pattern_t *pwmled0_pattern_select();
-pattern_t *pwmled1_pattern_select();
-pattern_t *pwmled2_pattern_select();
+pattern_t *pwmled_pattern_select();
 pattern_t *status_led_pattern_select();
 pattern_t *illumination_led_pattern_select();
 pattern_t *laser_pattern_select();
 
 /* main.c */
-void power_down();
+void power_down(unsigned char err);
 
 #endif /* !LIGHTS_H__ */