Create a d3aa firmware variant with jumpstart, and fix a bug where ch…

…annel mode config could be accessed from off if globals config was not enabled
Isilmerie · Oct 14, 2024 · f30caa3 · f30caa3
1 parent 73462fd
commit f30caa3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/MODELS b/MODELS
@@ -24,6 +24,7 @@ Model     MCU         Name
 0143      attiny1634  hank-noctigon-m44
 0151      attiny1634  hank-emisar-d4k-3ch
 0161      avr32dd20   hank-emisar-d3aa
+0162      avr32dd20   hank-emisar-d3aa-jumpstart
 0211      attiny1634  hank-noctigon-kr4
 0212      attiny1634  hank-noctigon-kr4-nofet
 0213      attiny1634  hank-noctigon-kr4-219

diff --git a/hw/hank/emisar-d3aa/jumpstart/anduril.h b/hw/hank/emisar-d3aa/jumpstart/anduril.h
@@ -0,0 +1,9 @@
+// Emisar D3AA config options for Anduril
+// Copyright (C) 2023 thefreeman, Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "hank/emisar-d3aa/anduril.h"
+
+#define USE_JUMP_START
+#define DEFAULT_JUMP_START_LEVEL 10
diff --git a/hw/hank/emisar-d3aa/jumpstart/model b/hw/hank/emisar-d3aa/jumpstart/model
@@ -0,0 +1 @@
+0162
diff --git a/ui/anduril/channel-modes.c b/ui/anduril/channel-modes.c
@@ -135,7 +135,7 @@ uint8_t channel_mode_state(Event event, uint16_t arg) {
 
     #if NUM_CHANNEL_MODES > 1
     // channel toggle menu on ... 9H?
-    else if (event == EV_click9_hold) {
+    else if ((event == EV_click9_hold) && (current_state == steady_state)) {
         push_state(channel_mode_config_state, 0);
         return EVENT_HANDLED;
     }