Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones

This commit is contained in:
Daniel Lange
2020-11-15 14:52:25 +01:00
7 changed files with 354 additions and 2 deletions

3
CRT.h
View File

@ -53,9 +53,10 @@ typedef enum ColorElements_ {
METER_TEXT,
METER_VALUE,
METER_VALUE_ERROR,
METER_VALUE_NOTICE,
METER_VALUE_IOREAD,
METER_VALUE_IOWRITE,
METER_VALUE_NOTICE,
METER_VALUE_OK,
LED_COLOR,
UPTIME,
BATTERY,