diff options
| author | Selene ToyKeeper | 2024-08-19 13:10:04 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2024-08-19 13:10:04 -0600 |
| commit | 4c2bbf92194ff5f41a87baa95c5388b325a27d2d (patch) | |
| tree | 2d2b51fc3ef800e55009bc5f01ef7119d4c32d6e /arch/attiny85.h | |
| parent | ts25-boost: reduced visible PWM, made party strobe less blurry (diff) | |
| parent | removed "Off -> 3H" strobe/mood mode access from Extended Simple UI (diff) | |
| download | anduril-4c2bbf92194ff5f41a87baa95c5388b325a27d2d.tar.gz anduril-4c2bbf92194ff5f41a87baa95c5388b325a27d2d.tar.bz2 anduril-4c2bbf92194ff5f41a87baa95c5388b325a27d2d.zip | |
Merge branch 'trunk' into wurkkos-ts25-boost
# By Selene ToyKeeper (20) and others
* trunk: (25 commits)
removed "Off -> 3H" strobe/mood mode access from Extended Simple UI
include hardware-specific readme files in the release .zip
added change log for 2024-04-20 release
Forgot to update model count after the last couple additions
use low aux for chan-aux level 0
MODELS: added emisar-d3aa
make-release.sh should use version-string.sh instead of duplicating code
d3aa: fixed voltage calculation to use 0.02V units instead of 0.025V
d3aa weak battery test: blink 3x instead of 2x, and omit number readout
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)
weak battery detection: use different thresholds for AA and Li-Ion (also, fixed bug where a totally empty li-ion didn't get limited)
d3aa: got weak battery detection actually working, and not letting the magic smoke out of updi adapters any more (probably)
dammit, got alkaline detection half working and then my flashing adapter died (saving progress here so I can work on a different branch)
fixed inaccurate comment (thanks to xikteny for spotting it)
d3aa fine-tuning: - new ramp - production style config defaults (simple mode, Hank config) - candle tuning - fixed way-too-fast thermal regulation (might still be a bit fast, but it's a lot better)
d3aa: fixed voltage measurement
Allow manually running GitHub actions workflows
Bugfix: Prevent switching channel modes when in tactical mode
...
# Conflicts:
# arch/attiny1616.c (fixed)
Diffstat (limited to 'arch/attiny85.h')
| -rw-r--r-- | arch/attiny85.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/attiny85.h b/arch/attiny85.h index 3f6ffcb..06a1061 100644 --- a/arch/attiny85.h +++ b/arch/attiny85.h @@ -53,7 +53,7 @@ inline void mcu_adc_off(); inline uint16_t mcu_adc_result(); -// return Volts * 40, range 0 to 6.375V +// return Volts * 50, range 0 to 5.10V #define voltage_raw2cooked mcu_vdd_raw2cooked inline uint8_t mcu_vdd_raw2cooked(uint16_t measurement); inline uint8_t mcu_vdivider_raw2cooked(uint16_t measurement); |