mirror of https://github.com/arendst/Tasmota.git
Resolved conflicts
This commit is contained in:
parent
9eafb7c040
commit
aac46815b5
|
@ -94,8 +94,7 @@ enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_E
|
|||
, FUNC_DISPLAY_NUMBER, FUNC_DISPLAY_FLOAT,
|
||||
FUNC_DISPLAY_NUMBERNC, FUNC_DISPLAY_FLOATNC, FUNC_DISPLAY_BRIGHTNESS, FUNC_DISPLAY_RAW,
|
||||
FUNC_DISPLAY_LEVEL, FUNC_DISPLAY_SEVENSEG_TEXT, FUNC_DISPLAY_SEVENSEG_TEXTNC,
|
||||
FUNC_DISPLAY_SCROLLDELAY, FUNC_DISPLAY_CLOCK };
|
||||
|
||||
FUNC_DISPLAY_SCROLLDELAY, FUNC_DISPLAY_CLOCK
|
||||
};
|
||||
|
||||
enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
|
||||
|
|
Loading…
Reference in New Issue