rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-20 16:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Jm Casler
2020-10-11 21:19:22 -07:00
parent 58cfd1317c
commit 10008d4eef
8 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PowerFSM.h
View File

@@ -20,6 +20,6 @@
#define EVENT_POWER_DISCONNECTED 14
extern Fsm powerFSM;
extern State statePOWER;
extern State statePOWER, stateSERIAL;
void PowerFSM_setup();