battery.c: rework

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

diff --git a/firmware/lights.h b/firmware/lights.h
index a016340c0ed5dffd1153a103785b2c5b989adf15..5032e1124b8633f2250a608632062192f63c536c 100644 (file)
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -1,6 +1,8 @@
 #ifndef LIGHTS_H__
 #define LIGHTS_H__ 1
 
+#define TESTING_FW 1
+
 #define N_LEDS 7
 #define N_PWMLEDS 3
 #define N_PWMLED_MODES 4
@@ -9,30 +11,31 @@
 
 /* logging.c */
 #ifdef USE_LOGGING
+void init_log();
 void log_set_state(unsigned char val);
-void log_init();
 void log_flush();
 void log_byte(unsigned char byte);
 void log_word(uint16_t word);
 #else
+void inline init_log() { }
 void inline log_set_state(unsigned char val) { }
-void inline log_init() { }
 void inline log_flush() { }
 void inline log_byte(unsigned char byte) { }
 void inline log_word(uint16_t word) { }
 #endif
 
 /* adc.c */
+#define PWMLED_ADC_SHIFT 3 /* 1<<3 measurements per single callback */
 void init_adc();
 void susp_adc();
-void timer_start_adcs();
 
 /* pwm.c */
-#define PWM_MAX 0x1E4 /* This should be different than ADC frequency 125 kHz */
-#define PWM_STEP_SHIFT 2 /* second parameter of pwm_set is shifted by
-                         * PWM_STEP_SHIFT bits to the right before setting
-                         * into HW */
-
+/*
+ * The real Timer/Counter 1 frequency should not be too close to the
+ * A/D converter frequency (125 kHz). Note that this is not the Top
+ * value of T/C 1, it is shifted by PWM_STEP_SHIFT as described in pwm.c
+ */
+#define PWM_MAX 0x780
 void init_pwm();
 void susp_pwm();
 void pwm_off(unsigned char n);
@@ -67,15 +70,11 @@ typedef struct {
 
 #define PATTERN_FOREVER 0x1F
 #define PATTERN_END { 0, 0 }
-extern pattern_t off_pattern[];
-extern pattern_t zero_pattern[];
-extern pattern_t on_pattern[];
-extern pattern_t mode1_pattern[];
-
 void init_pattern();
 void patterns_next_tick();
 void led_set_pattern(unsigned char led, pattern_t *pattern);
-pattern_t *number_pattern(unsigned char num);
+pattern_t *number_pattern(unsigned char num, unsigned char inv);
+void pattern_reload();
 
 /* buttons.c */
 #define MAX_USER_PARAMS 3
@@ -83,13 +82,28 @@ void init_buttons();
 void susp_buttons();
 void timer_check_buttons();
 unsigned char get_user_param(unsigned char param);
-pattern_t *status_pattern_select(unsigned char n);
 unsigned char buttons_wait_for_release();
+unsigned char buttons_setup_in_progress();
+pattern_t *buttons_setup_status0_pattern_select();
+pattern_t *buttons_setup_status1_pattern_select();
 
 /* battery.c */
-extern volatile unsigned char battery_100mv;
 void battery_adc();
 void init_battery();
+unsigned char battery_gauge();
+
+/* control.c */
+extern pattern_t on1_pattern[];
+
+void init_control();
+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 *status_led_pattern_select();
+pattern_t *illumination_led_pattern_select();
+pattern_t *laser_led_pattern_select();
 
 /* main.c */
 void power_down();