From 483c2e00f16953f6305fb1f8b7479c2b09ada792 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 11 Sep 2015 16:41:05 -0600 Subject: Refactored blf-a6 a bunch to export code to includes and make attiny portability a bit better. Moved MCU hardware options and pin layout to tk-attiny.h. Moved voltage and OTC hardcoded values to tk-calibration.h. Moved delay functions to tk-delay.h, and made it use BOGOMIPS instead of DELAY_TWEAK. Moved voltage ADC and most of the battcheck code to tk-voltage.h. Changed EEPLEN to EEPSIZE. Made 1.1V reference symbol consistent across MCUs to avoid repeated #if/#else clauses. --- tk-voltage.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 tk-voltage.h (limited to 'tk-voltage.h') diff --git a/tk-voltage.h b/tk-voltage.h new file mode 100644 index 0000000..a335447 --- /dev/null +++ b/tk-voltage.h @@ -0,0 +1,75 @@ +#ifndef TK_VOLTAGE_H +#define TK_VOLTAGE_H +/* + * Voltage / battcheck functions. + * + * Copyright (C) 2015 Selene ToyKeeper + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include "tk-attiny.h" +#include "tk-calibration.h" + +#ifdef VOLTAGE_MON +inline void ADC_on() { + // disable digital input on ADC pin to reduce power consumption + DIDR0 |= (1 << ADC_DIDR); + // 1.1v reference, left-adjust, ADC1/PB2 + ADMUX = (1 << V_REF) | (1 << ADLAR) | ADC_CHANNEL; + // enable, start, prescale + ADCSRA = (1 << ADEN ) | (1 << ADSC ) | ADC_PRSCL; +} + +uint8_t get_voltage() { + // Start conversion + ADCSRA |= (1 << ADSC); + // Wait for completion + while (ADCSRA & (1 << ADSC)); + // Send back the result + return ADCH; +} +#else +inline void ADC_off() { + ADCSRA &= ~(1<<7); //ADC off +} +#endif + +#ifdef USE_BATTCHECK +PROGMEM const uint8_t voltage_blinks[] = { + // 0 blinks for less than 1% + ADC_0, // 1 blink for 1%-25% + ADC_25, // 2 blinks for 25%-50% + ADC_50, // 3 blinks for 50%-75% + ADC_75, // 4 blinks for 75%-100% + ADC_100, // 5 blinks for >100% + 255, // Ceiling, don't remove (6 blinks means "error") +}; + +inline uint8_t battcheck() { + // Return an int, number of "blinks", for approximate battery charge + // Uses the table above for return values + uint8_t i, voltage; + voltage = get_voltage(); + // figure out how many times to blink + for (i=0; + voltage > pgm_read_byte(voltage_blinks + i); + i ++) {} + return i; +} +#endif + + +#endif // TK_VOLTAGE_H -- cgit v1.2.3 From c0aacf8d1161aa7ce341a3332252f623062e2a1a Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sat, 3 Oct 2015 16:49:41 -0600 Subject: Added volts+tenths and 8-bar battery check styles. Reworked how voltage definitions work, and added one for each tenth of a volt. Set default calibration for RMM attiny25V driver. Made battcheck.py output all tenths in a wide range. Changed bistro to use x**3 curve for better mode spacing. Changed bistro's blink() to be compatible with volts+tenths code. Tried to fit volts_tenths into blf-a6 for attiny13a but failed. Made blf-a6 compatible with 8-bar battery check style. --- tk-voltage.h | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 86 insertions(+), 8 deletions(-) (limited to 'tk-voltage.h') diff --git a/tk-voltage.h b/tk-voltage.h index a335447..5eaf0d4 100644 --- a/tk-voltage.h +++ b/tk-voltage.h @@ -48,16 +48,93 @@ inline void ADC_off() { #endif #ifdef USE_BATTCHECK +#ifdef BATTCHECK_4bars PROGMEM const uint8_t voltage_blinks[] = { - // 0 blinks for less than 1% - ADC_0, // 1 blink for 1%-25% - ADC_25, // 2 blinks for 25%-50% - ADC_50, // 3 blinks for 50%-75% - ADC_75, // 4 blinks for 75%-100% - ADC_100, // 5 blinks for >100% - 255, // Ceiling, don't remove (6 blinks means "error") + // 0 blinks for less than 1% + ADC_0p, // 1 blink for 1%-25% + ADC_25p, // 2 blinks for 25%-50% + ADC_50p, // 3 blinks for 50%-75% + ADC_75p, // 4 blinks for 75%-100% + ADC_100p, // 5 blinks for >100% + 255, // Ceiling, don't remove (6 blinks means "error") }; - +#endif // BATTCHECK_4bars +#ifdef BATTCHECK_8bars +PROGMEM const uint8_t voltage_blinks[] = { + // 0 blinks for less than 1% + ADC_30, // 1 blink for 1%-12.5% + ADC_33, // 2 blinks for 12.5%-25% + ADC_35, // 3 blinks for 25%-37.5% + ADC_37, // 4 blinks for 37.5%-50% + ADC_38, // 5 blinks for 50%-62.5% + ADC_39, // 6 blinks for 62.5%-75% + ADC_40, // 7 blinks for 75%-87.5% + ADC_41, // 8 blinks for 87.5%-100% + ADC_42, // 9 blinks for >100% + 255, // Ceiling, don't remove (10 blinks means "error") +}; +#endif // BATTCHECK_8bars +#ifdef BATTCHECK_VpT +/* +PROGMEM const uint8_t v_whole_blinks[] = { + // 0 blinks for (shouldn't happen) + 0, // 1 blink for (shouldn't happen) + ADC_20, // 2 blinks for 2V + ADC_30, // 3 blinks for 3V + ADC_40, // 4 blinks for 4V + 255, // Ceiling, don't remove +}; +PROGMEM const uint8_t v_tenth_blinks[] = { + // 0 blinks for less than 1% + ADC_30, + ADC_33, + ADC_35, + ADC_37, + ADC_38, + ADC_39, + ADC_40, + ADC_41, + ADC_42, + 255, // Ceiling, don't remove +}; +*/ +PROGMEM const uint8_t voltage_blinks[] = { + // 0 blinks for (shouldn't happen) + ADC_25,(2<<5)+5, + ADC_26,(2<<5)+6, + ADC_27,(2<<5)+7, + ADC_28,(2<<5)+8, + ADC_29,(2<<5)+9, + ADC_30,(3<<5)+0, + ADC_31,(3<<5)+1, + ADC_32,(3<<5)+2, + ADC_33,(3<<5)+3, + ADC_34,(3<<5)+4, + ADC_35,(3<<5)+5, + ADC_36,(3<<5)+6, + ADC_37,(3<<5)+7, + ADC_38,(3<<5)+8, + ADC_39,(3<<5)+9, + ADC_40,(4<<5)+0, + ADC_41,(4<<5)+1, + ADC_42,(4<<5)+2, + ADC_43,(4<<5)+3, + ADC_44,(4<<5)+4, + 255, (1<<5)+1, // Ceiling, don't remove +}; +inline uint8_t battcheck() { + // Return an composite int, number of "blinks", for approximate battery charge + // Uses the table above for return values + // Return value is 3 bits of whole volts and 5 bits of tenths-of-a-volt + uint8_t i, voltage; + voltage = get_voltage(); + // figure out how many times to blink + for (i=0; + voltage > pgm_read_byte(voltage_blinks + i); + i += 2) {} + return pgm_read_byte(voltage_blinks + i + 1); +} +#else // #ifdef BATTCHECK_VpT inline uint8_t battcheck() { // Return an int, number of "blinks", for approximate battery charge // Uses the table above for return values @@ -69,6 +146,7 @@ inline uint8_t battcheck() { i ++) {} return i; } +#endif // BATTCHECK_VpT #endif -- cgit v1.2.3