diff options
| author | Selene ToyKeeper | 2024-03-29 08:21:24 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2024-03-29 08:21:24 -0600 |
| commit | 849bc5951b27f3f6296d28e8f62f2077e811e2ad (patch) | |
| tree | 96939f9b03267c410bb211427f5ca346dc75df04 /hw/sofirn/sp10-pro | |
| parent | d3aa weak battery test: blink 3x instead of 2x, and omit number readout (diff) | |
| parent | use smooth steps in lockout mode, if enabled (diff) | |
| download | anduril-849bc5951b27f3f6296d28e8f62f2077e811e2ad.tar.gz anduril-849bc5951b27f3f6296d28e8f62f2077e811e2ad.tar.bz2 anduril-849bc5951b27f3f6296d28e8f62f2077e811e2ad.zip | |
Merge branch 'trunk' into emisar-d3aa
FIXME: The d3aa's voltage calculator needs to be fixed after this merge.
* trunk:
use smooth steps in lockout mode, if enabled
fixed Tactical Mode's strobes when Momentary Mode not enabled
increased voltage precision from 0.025V to 0.02V (so 0 to 255 now goes from 0.00V to 5.10V)
fixed inaccurate comment (thanks to xikteny for spotting it)
Allow manually running GitHub actions workflows
Bugfix: Prevent switching channel modes when in tactical mode
Bugfix: Tactical mode has a dependency on momentary mode
Diffstat (limited to 'hw/sofirn/sp10-pro')
| -rw-r--r-- | hw/sofirn/sp10-pro/hwdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sofirn/sp10-pro/hwdef.h b/hw/sofirn/sp10-pro/hwdef.h index f220318..43da9d0 100644 --- a/hw/sofirn/sp10-pro/hwdef.h +++ b/hw/sofirn/sp10-pro/hwdef.h @@ -62,8 +62,8 @@ enum CHANNEL_MODES { // Voltage divider battLVL #define USE_VOLTAGE_DIVIDER // use a dedicated pin, not VCC, because VCC input is regulated -#define DUAL_VOLTAGE_FLOOR (4*21) // for AA/14500 boost drivers, don't indicate low voltage if below this level -#define DUAL_VOLTAGE_LOW_LOW (4*7) // the lower voltage range's danger zone 0.7 volts (NiMH) +#define DUAL_VOLTAGE_FLOOR (21*dV) // for AA/14500 boost drivers, don't indicate low voltage if below this level +#define DUAL_VOLTAGE_LOW_LOW ( 7*dV) // the lower voltage range's danger zone 0.7 volts (NiMH) #define ADMUX_VOLTAGE_DIVIDER ADC_MUXPOS_AIN9_gc // which ADC channel to read #undef voltage_raw2cooked |