Resolved conflicts

This commit is contained in:
Ajith Vasudevan 2021-02-15 16:34:06 +05:30
parent 9eafb7c040
commit aac46815b5
1 changed files with 1 additions and 2 deletions

View File

@ -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 };