summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7580466)
This will allow us to use power-down sleep when neither ADC nor PWM
is used.
#define NUM_ADCS 2
volatile static unsigned char current_adc;;
#define NUM_ADCS 2
volatile static unsigned char current_adc;;
-static unsigned char need_battery_adc;
+volatile unsigned char need_battery_adc;
static uint16_t adc_sum, read_zero, drop_count, read_count, n_reads_log;
volatile uint16_t jiffies;
static uint16_t adc_sum, read_zero, drop_count, read_count, n_reads_log;
volatile uint16_t jiffies;
-static void inline adc_based_timer()
-{
- static unsigned char count;
-
- if (++count < 40) // about 100 Hz jiffies
- return;
-
- count = 0;
- ++jiffies;
-
- if ((jiffies & 0x007F) == 1) { // about every 1s
- need_battery_adc = 1;
- }
- if ((jiffies & 0x0007) == 0) {
- patterns_next_tick();
- }
- timer_check_buttons();
-}
-
ISR(ADC_vect) { // IRQ handler
uint16_t adcval = ADCW;
ISR(ADC_vect) { // IRQ handler
uint16_t adcval = ADCW;
if (read_zero) {
setup_mux(current_adc);
read_zero = 0;
if (read_zero) {
setup_mux(current_adc);
read_zero = 0;
#include "lights.h"
#define WAKEUP_LIMIT 5 // times 100 ms
#include "lights.h"
#define WAKEUP_LIMIT 5 // times 100 ms
-#define SHORT_PRESS_MIN 10 // in jiffies (100 Hz ticks)
-#define SHORT_PRESS_MAX 50
-#define LONG_PRESS_MIN 100
+#define SHORT_PRESS_MIN 2 // in jiffies (16 Hz ticks)
+#define SHORT_PRESS_MAX 5
+#define LONG_PRESS_MIN 10
static uint16_t button_start;
static unsigned char prev_state;
static uint16_t button_start;
static unsigned char prev_state;
} else if (!cur && prev) { // --- just released ---
uint16_t duration = jiffies - button_start;
} else if (!cur && prev) { // --- just released ---
uint16_t duration = jiffies - button_start;
- if (duration > SHORT_PRESS_MIN && duration < SHORT_PRESS_MAX) {
+ if (duration >= SHORT_PRESS_MIN && duration < SHORT_PRESS_MAX) {
short_press();
} else if (duration > LONG_PRESS_MIN) {
// set_status_led(button, NULL);
short_press();
} else if (duration > LONG_PRESS_MIN) {
// set_status_led(button, NULL);
/* adc.c */
#define PWMLED_ADC_SHIFT 1 /* 1<<1 measurements per single callback */
/* adc.c */
#define PWMLED_ADC_SHIFT 1 /* 1<<1 measurements per single callback */
-extern volatile uint16_t jiffies;
+extern volatile unsigned char need_battery_adc;
void init_adc();
void susp_adc();
void init_adc();
void susp_adc();
void set_error(unsigned char err);
/* wdt.c */
void set_error(unsigned char err);
/* wdt.c */
+extern volatile uint16_t jiffies;
void init_wdt();
void susp_wdt();
void init_wdt();
void susp_wdt();
+ wdt_enable(WDTO_60MS);
+ WDTCR |= _BV(WDIE);
+ISR(WDT_vect) {
+ ++jiffies;
+
+ if (jiffies & 0x000F) {
+ need_battery_adc = 1; // about every 1s
+ }
+
+ patterns_next_tick();
+ timer_check_buttons();
+}