Skip to content

Commit

Permalink
Create a d3aa firmware variant with jumpstart, and fix a bug where ch…
Browse files Browse the repository at this point in the history
…annel mode config could be accessed from off if globals config was not enabled
  • Loading branch information
SiteRelEnby committed Sep 11, 2024
1 parent e43203f commit fbbd8f0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 0 deletions.
1 change: 1 addition & 0 deletions MODELS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions hw/hank/emisar-d3aa/jumpstart/anduril.h
Original file line number Diff line number Diff line change
@@ -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 20
1 change: 1 addition & 0 deletions hw/hank/emisar-d3aa/jumpstart/model
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0162
9 changes: 9 additions & 0 deletions ui/anduril/off-mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,15 @@ uint8_t off_state(Event event, uint16_t arg) {
push_state(globals_config_state, 0);
return EVENT_HANDLED;
}
#else
// no need for this fix if we don't have >1 channel (as the 9H from on menu won't
// be there for it to fall through to). The reason otherwise it falls through is
// because that menu is defined in channel_mode_state which exists under all other states.
#if NUM_CHANNEL_MODES > 1
else if (event == EV_click9_hold) {
return EVENT_HANDLED;
}
#endif
#endif

return EVENT_NOT_HANDLED;
Expand Down

0 comments on commit fbbd8f0

Please sign in to comment.