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=a3dbb636c61ac88c8d5be2c161963f4825091b6d;hp=753e281ca09e55bf95d5280d84b3ff2d1f2cff59;hb=1d5dfb4d273a61877eb5937f93fbd266b782bc7a;hpb=72c8810f9c8c1c8717364174b8792b1f0c988353

diff --git a/firmware/lights.h b/firmware/lights.h
index 753e281..a3dbb63 100644
--- 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) { }
@@ -25,9 +29,11 @@ void inline log_word(uint16_t word) { }
 #endif
 
 /* adc.c */
-#define PWMLED_ADC_SHIFT 3 /* 1<<3 measurements per single callback */
+#define PWMLED_ADC_SHIFT 1 /* 1<<1 measurements per single callback */
 void init_adc();
 void susp_adc();
+void timer_start_slow_adcs();
+extern volatile unsigned char adc_is_on;
 
 /* pwm.c */
 /*
@@ -36,11 +42,15 @@ void susp_adc();
  * value of T/C 1, it is shifted by PWM_STEP_SHIFT as described in pwm.c
  */
 #define PWM_MAX 0x780
+extern volatile unsigned char channels_running;
+#define PWM_IS_ON(n)	(channels_running & (1 << (n)))
+#define TIMER1_IS_ON()	(channels_running)
 void init_pwm();
 void susp_pwm();
 void pwm_off(unsigned char n);
 void pwm_set(unsigned char n, uint16_t stride);
 void pwm_timer();
+void pwm_disable_if_not_needed();
 
 /* tmr.c */
 extern volatile uint16_t jiffies;
@@ -58,18 +68,33 @@ void susp_gpio();
 void gpio_set(unsigned char n, unsigned char on);
 
 /* ambient.c */
+#define AMBIENT_ADC_SHIFT 0	/* 1 measurement per callback */
 void init_ambient();
+void susp_ambient();
+void ambient_log_min_max();
 extern volatile unsigned char ambient_zone;
 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_FOREVER 0x1F
 #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);
@@ -81,6 +106,7 @@ void pattern_reload();
 void init_buttons();
 void susp_buttons();
 void timer_check_buttons();
+void button_adc(uint16_t adcval);
 unsigned char get_user_param(unsigned char param);
 unsigned char buttons_wait_for_release();
 unsigned char buttons_setup_in_progress();
@@ -88,25 +114,26 @@ pattern_t *buttons_setup_status0_pattern_select();
 pattern_t *buttons_setup_status1_pattern_select();
 
 /* battery.c */
-extern volatile unsigned char battery_100mv;
+extern volatile unsigned char battery_critical;
 void battery_adc();
 void init_battery();
+unsigned char battery_gauge();
 
 /* control.c */
 extern pattern_t on1_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_led_pattern_select();
+pattern_t *laser_pattern_select();
 
 /* main.c */
-void power_down();
+void power_down(unsigned char err);
 
 #endif /* !LIGHTS_H__ */