aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/darkhorse/darkhorse.c
diff options
context:
space:
mode:
authorSelene ToyKeeper2019-01-23 19:04:21 -0700
committerSelene ToyKeeper2019-01-23 19:04:21 -0700
commit187ce7a5b7b48e8e1643efb8567e04b7bb2bf2df (patch)
treed6b68c6d02eed42b6fd6b9041f712baf40392b30 /spaghetti-monster/darkhorse/darkhorse.c
parentUpdated README to point at build/flash scripts. (diff)
parentmerged trunk (diff)
downloadanduril-187ce7a5b7b48e8e1643efb8567e04b7bb2bf2df.tar.gz
anduril-187ce7a5b7b48e8e1643efb8567e04b7bb2bf2df.tar.bz2
anduril-187ce7a5b7b48e8e1643efb8567e04b7bb2bf2df.zip
merged past 2 months of updates from fsm branch:
Diffstat (limited to 'spaghetti-monster/darkhorse/darkhorse.c')
-rw-r--r--spaghetti-monster/darkhorse/darkhorse.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c
index d76afc2..e613f55 100644
--- a/spaghetti-monster/darkhorse/darkhorse.c
+++ b/spaghetti-monster/darkhorse/darkhorse.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define FSM_EMISAR_D4_DRIVER
+#include "hwdef-Emisar_D4.h"
#define USE_LVP
#define USE_THERMAL_REGULATION
#define DEFAULT_THERM_CEIL 45
@@ -263,6 +263,7 @@ uint8_t strobe_beacon_state(Event event, uint16_t arg) {
return MISCHIEF_MANAGED;
}
// 1 click (initially): cancel current blink
+ // FIXME: this is no longer necessary; FSM does this automatically now
if (event == EV_click1_release) {
interrupt_nice_delays();
return MISCHIEF_MANAGED;