mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-20 21:41:29 -05:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
18 lines
377 B
C
18 lines
377 B
C
/**
|
|
* @brief This class enables on the fly software and hardware setup.
|
|
* It will contain all command messages to change internal settings.
|
|
*/
|
|
|
|
enum class Cmd {
|
|
INVALID,
|
|
SET_ON,
|
|
SET_OFF,
|
|
ON_PRESS,
|
|
START_ALERT_FRAME,
|
|
STOP_ALERT_FRAME,
|
|
START_FIRMWARE_UPDATE_SCREEN,
|
|
STOP_BOOT_SCREEN,
|
|
SHOW_PREV_FRAME,
|
|
SHOW_NEXT_FRAME,
|
|
NOOP
|
|
}; |