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=9d0386878bf9b79ff774a1e6de929ee74f6cb2f2;hp=4a23436ea79dd84b8b21a055c70890cce5127fbe;hb=94524330d5709845fe0bbe8562fd68deedcb818c;hpb=647f353f4d8c87c5cf18cae905e9d600cd0e6bcb

diff --git a/firmware/lights.h b/firmware/lights.h
index 4a23436..9d03868 100644
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -1,21 +1,27 @@
 #ifndef LIGHTS_H__
 #define LIGHTS_H__ 1
 
-#define N_LEDS 7
+#define TESTING_FW 1
+
+#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) { }
@@ -23,20 +29,28 @@ void inline log_word(uint16_t word) { }
 #endif
 
 /* adc.c */
+#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 */
-#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
+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;
@@ -47,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();
@@ -54,29 +76,46 @@ 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);
 pattern_t *number_pattern(unsigned char num, unsigned char inv);
 void pattern_reload();
+void pwmleds_update_mode();
 
 /* buttons.c */
 #define MAX_USER_PARAMS 3
 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();
@@ -84,24 +123,28 @@ 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[];
+extern pattern_t on_pattern[];
+extern volatile unsigned char braking;
 
 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();
+void pwmled_select_brightness();
 
 /* main.c */
-void power_down();
+void power_down(unsigned char err);
 
 #endif /* !LIGHTS_H__ */