* When running, the "-" button is used for decreasing the output power,
* the "+" button is for increasing it.
* When on the lowest power state, the "-" button switches the system off.
- * TODO: Long "-" button press switches the system off, long "+" button
+ * Long "-" button press switches the system off, long "+" button
* press sets the output power to maximum.
*
* Status LED:
#define WAKEUP_LIMIT 5 // times WAKEUP_POLL
/* output power levels */
-#define N_STEPS 5
-static unsigned char steps[] = { 60, 85, 121, 171, 242 };
-static unsigned char intensity = 0; // selected power level
+#define N_POWER_LEVELS 5
+static unsigned char power_levels[N_POWER_LEVELS] = {
+
+};
+
+static unsigned char power_level = 0; // selected power level
/* which state (output on or output off) are we measuring now */
static volatile unsigned char adc_type, adc_drop;
+#define ADC_RUNAVG_SHIFT 5 // running average shift on batt_on, batt_off
static volatile uint16_t batt_on, batt_off; // measured voltage
+/*
+ * The voltage divider has 1M5 and 300K resistors (i.e. it measures 1/6th of
+ * the real voltage), ADC uses 1.1V internal reference.
+ * Macro to calculate upper eight bits of the ADC running-averaged value
+ * from the voltage in milivolts.
+ */
+#define ADC_1100MV_VALUE 1071 // measured, not exactly 1100
+#define MV_TO_ADC8(mV) ((unsigned char)(((uint32_t)(1UL << ADC_RUNAVG_SHIFT) \
+ * (1024UL * (mV)) \
+ / (6UL * ADC_1100MV_VALUE)) >> 8))
+#define BATT_N_LEVELS 3
+static unsigned char batt_levels[BATT_N_LEVELS] = {
+ MV_TO_ADC8(3500),
+ MV_TO_ADC8(3700),
+ MV_TO_ADC8(3900),
+};
+
/* timing by WDT */
static volatile unsigned char jiffies, next_clock_tick;
+/* button press duration (in jiffies) */
+#define BUTTON_SHORT_MIN 1
+#define BUTTON_LONG_MIN 10
+
/* ========= Analog to Digital Converter (battery voltage) ========== */
static void adc_init()
{
// so don't bother with it.
if (adc_type == 0) {
if (batt_off) {
- batt_off += adcw - (batt_off >> 5);
+ batt_off += adcw - (batt_off >> ADC_RUNAVG_SHIFT);
} else {
- batt_off = adcw << 5;
+ batt_off = adcw << ADC_RUNAVG_SHIFT;
}
} else {
if (batt_on) {
- batt_on += adcw - (batt_on >> 5);
+ batt_on += adcw - (batt_on >> ADC_RUNAVG_SHIFT);
} else {
- batt_on = adcw << 5;
+ batt_on = adcw << ADC_RUNAVG_SHIFT;
}
}
}
TCCR1 = _BV(CS11) | _BV(CS13); // clk/512 = 2 kHz
GTCCR = _BV(COM1B1) | _BV(PWM1B);
OCR1C = 255;
- OCR1B = steps[0];
+ // OCR1B = steps[0];
+ OCR1B = 0;
TIMSK = _BV(OCIE1B) | _BV(TOIE1);
}
}
/* ======== Button press detection and handling ===================== */
-static void button_one_pressed()
+static void button_pressed(unsigned char button, unsigned char long_press)
{
- if (intensity > 0) {
- pwm_set(steps[--intensity]);
- } else {
- power_down();
- }
-}
-
-static void button_two_pressed()
-{
- if (intensity < N_STEPS-1) {
- pwm_set(steps[++intensity]);
+ // ignore simlultaneous button 1 and 2 press
+ if (long_press) {
+ if (button == 1) {
+ power_down();
+ } else if (button == 2) {
+ power_level = N_POWER_LEVELS-1;
+ }
+ } else { // short press
+ if (button == 1) {
+ if (power_level > 0) {
+ --power_level;
+ } else {
+ power_down();
+ }
+ } else if (button == 2) {
+ if (power_level < N_POWER_LEVELS-1) {
+ ++power_level;
+ }
+ }
}
}
unsigned char newstate = buttons_pressed();
if (newstate == button_state) {
- if (newstate && button_state_time < 4)
+ if (newstate && button_state_time < BUTTON_LONG_MIN)
++button_state_time;
+
+ if (newstate && button_state_time >= BUTTON_LONG_MIN) {
+ status_led_on();
+ }
return;
}
}
// just released
- switch (button_state) {
- case 1: button_one_pressed();
- break;
- case 2: button_two_pressed();
- break;
- default: // ignore when both are preseed
- break;
- }
+ if (button_state_time >= BUTTON_SHORT_MIN)
+ button_pressed(button_state,
+ button_state_time >= BUTTON_LONG_MIN ? 1 : 0);
button_state = newstate;
+ button_state_time = 0;
}
/* ============ Status LED blinking =================================== */
static unsigned char blink_on_time, blink_off_time, n_blinks;
static unsigned char blink_counter;
+static unsigned char battery_level()
+{
+ unsigned char i, adc8;
+
+ // NOTE: we use 8-bit value only, so we don't need lock to protect
+ // us against concurrently running ADC IRQ handler:
+ adc8 = batt_off >> 8;
+
+ for (i = 0; i < BATT_N_LEVELS; i++)
+ if (batt_levels[i] > adc8)
+ break;
+
+ return i;
+}
+
static void status_led_next_pattern()
{
+
// for now, display the selected intensity
- n_blinks = intensity + 1;
+ n_blinks = power_level + 1;
+ // n_blinks = battery_level() + 1;
blink_on_time = 0;
blink_off_time = 2;
blink_counter = 10;
{
log_init();
+#if 0
+ log_word(batt_levels[0]);
+ log_word(batt_levels[1]);
+ log_word(batt_levels[2]);
+ log_flush();
+#endif
+
power_down();
sei();
// FIXME: Maybe handle new ADC readings as well?
if (next_clock_tick) {
next_clock_tick = 0;
- timer_check_buttons();
timer_blink();
+ // this has to be after the timer_blink() call
+ // to override the status LED during long button press
+ timer_check_buttons();
+
+ if ((jiffies & 0x0F) == 0) {
+ unsigned char i;
+
+ for (i = 0; i < BATT_N_LEVELS; i++)
+ if (batt_levels[i] > batt_off)
+ break;
+
+#if 0
+ log_byte(0xcc);
+ log_byte(i);
+ log_byte(batt_off >> 8);
+ log_byte(batt_on >> 8);
+#endif
+ }
log_flush();
}
}
https://www.fi.muni.cz/~kas/git / heater.git / blobdiff