battery.c: rework

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

diff --git a/firmware/lights.h b/firmware/lights.h
index 4a23436ea79dd84b8b21a055c70890cce5127fbe..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
@@ -23,15 +25,17 @@ 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();
 
 /* 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);
@@ -84,9 +88,9 @@ 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[];
@@ -99,6 +103,7 @@ 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();