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

1 files changed, 3 insertions, 3 deletions

diff --git a/hw/thefreeman/avr32dd20-devkit/hwdef.c b/hw/thefreeman/avr32dd20-devkit/hwdef.c
index 460082f..5b534d2 100644
--- a/hw/thefreeman/avr32dd20-devkit/hwdef.c
+++ b/hw/thefreeman/avr32dd20-devkit/hwdef.c
@@ -119,13 +119,13 @@ bool gradual_tick_main(uint8_t gt) {
 
 uint8_t voltage_raw2cooked(uint16_t measurement) {
     // In : 65535 * BATTLVL / 1.024V
-    // Out: uint8_t: Vbat * 40
+    // Out: uint8_t: Vbat * 50
     // BATTLVL = Vbat * (100.0/(330+100)) = Vbat / 4.3
-    // So, Out = In * 4.3 / 1600
+    // So, Out = In * 4.3 / 1280
     // (plus a bit of fudging to fix the slope and offset,
     //  based on measuring actual hardware)
     uint8_t result = (uint32_t)(measurement + (65535 * 4 / 1024))
-                     * 43 / 16128;
+                     * 43 / 12880;
     return result;
 }