RandyTheSilly/Civic-Segments
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Settings re-org (prep for separate hour and minute colors)

Browse Source
This commit is contained in:
Randall Winkhart
2026-06-27 19:59:14 -04:00
parent 7c1aa5b484
commit 206b066a58
5 changed files with 100 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+13 -11
View File
@@ -29,19 +29,21 @@
"PKJS_READY", "PKJS_READY",
"PKJS_TEMP_BAR_COUNT", "PKJS_TEMP_BAR_COUNT",
"CLAY_ENABLE_PEEK", "CLAY_ENABLE_PEEK",
"CLAY_BT_INDICATOR",
"CLAY_SHOW_TIME_MG", "CLAY_SHOW_TIME_MG",
"CLAY_USE_CUSTOM_LED", "CLAY_TRACK_BT_STATUS",
"CLAY_DATE_TIMEOUT", "CLAY_DATE_TIMEOUT_SECS",
"CLAY_LOW_FUEL_PERCENT", "CLAY_LOW_FUEL_PERCENT",
"CLAY_LED_COLOR", "CLAY_USE_CUSTOM_LED",
"CLAY_BG_COLOR", "CLAY_COLOR_LED",
"CLAY_BAR_MG_COLOR", "CLAY_COLOR_BG",
"CLAY_BAR_COOL_COLOR", "CLAY_COLOR_BAR_MG",
"CLAY_BAR_HOT_COLOR", "CLAY_COLOR_BAR_COOL",
"CLAY_TIME_MG_COLOR", "CLAY_COLOR_BAR_HOT",
"CLAY_FG_COLOR", "CLAY_COLOR_TIME_MG",
"CLAY_WARNING_COLOR" "CLAY_COLOR_LETTERS",
"CLAY_COLOR_HOURS",
"CLAY_COLOR_MINUTES",
"CLAY_COLOR_WARNING"
], ],
"resources": { "resources": {
"media": [ "media": [
src/c/main.c
+42 -32
View File
@@ -58,7 +58,7 @@ static void toggle_fuel_warning_state(bool enable_warning, bool force) {
if (!force && (enable_warning == s_fuel_is_warning)) { if (!force && (enable_warning == s_fuel_is_warning)) {
return; return;
} }
GColor dst = enable_warning ? settings.ColorWarning : settings.ColorFG; GColor dst = enable_warning ? settings.ColorWarning : settings.ColorLetters;
if (s_first_settings_application && !enable_warning && dst.argb == s_applied_e_f.argb) { if (s_first_settings_application && !enable_warning && dst.argb == s_applied_e_f.argb) {
// at startup, s_applied_e.argb is GColorWhite // at startup, s_applied_e.argb is GColorWhite
// for those using white fg, do not pointlessly replace white at startup if that is the destination anyway // for those using white fg, do not pointlessly replace white at startup if that is the destination anyway
@@ -74,7 +74,7 @@ static void toggle_temp_warning_state(bool enable_warning, bool force) {
if (!force && (enable_warning == s_temp_is_warning)) { if (!force && (enable_warning == s_temp_is_warning)) {
return; return;
} }
GColor dst = enable_warning ? settings.ColorWarning : settings.ColorFG; GColor dst = enable_warning ? settings.ColorWarning : settings.ColorLetters;
if (s_first_settings_application && !enable_warning && dst.argb == s_applied_c_h.argb) { if (s_first_settings_application && !enable_warning && dst.argb == s_applied_c_h.argb) {
// at startup, s_applied_c_h.argb is GColorWhite // at startup, s_applied_c_h.argb is GColorWhite
// for those using white fg, do not pointlessly replace white at startup if that is the destination anyway // for those using white fg, do not pointlessly replace white at startup if that is the destination anyway
@@ -87,7 +87,7 @@ static void toggle_temp_warning_state(bool enable_warning, bool force) {
} }
static void bt_callback(bool connected) { static void bt_callback(bool connected) {
GColor dst = connected ? settings.ColorFG : settings.ColorWarning; GColor dst = connected ? settings.ColorHours : settings.ColorWarning;
if (s_first_settings_application && connected && dst.argb == s_applied_time_date.argb) { if (s_first_settings_application && connected && dst.argb == s_applied_time_date.argb) {
// at startup, s_applied_time_date.argb is GColorWhite // at startup, s_applied_time_date.argb is GColorWhite
// for those using white fg, do not pointlessly replace white at startup if that is the destination anyway // for those using white fg, do not pointlessly replace white at startup if that is the destination anyway
@@ -528,57 +528,65 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
// CLAY SETTINGS // CLAY SETTINGS
Tuple *enable_peek_tuple = dict_find(iter, MESSAGE_KEY_CLAY_ENABLE_PEEK); Tuple *enable_peek_tuple = dict_find(iter, MESSAGE_KEY_CLAY_ENABLE_PEEK);
Tuple *track_bt_tuple = dict_find(iter, MESSAGE_KEY_CLAY_BT_INDICATOR);
Tuple *show_time_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_SHOW_TIME_MG); Tuple *show_time_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_SHOW_TIME_MG);
Tuple *use_custom_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_USE_CUSTOM_LED); Tuple *track_bt_status_tuple = dict_find(iter, MESSAGE_KEY_CLAY_TRACK_BT_STATUS);
Tuple *date_timeout_tuple = dict_find(iter, MESSAGE_KEY_CLAY_DATE_TIMEOUT); Tuple *date_timeout_secs_tuple = dict_find(iter, MESSAGE_KEY_CLAY_DATE_TIMEOUT_SECS);
Tuple *low_fuel_percent_tuple = dict_find(iter, MESSAGE_KEY_CLAY_LOW_FUEL_PERCENT); Tuple *low_fuel_percent_tuple = dict_find(iter, MESSAGE_KEY_CLAY_LOW_FUEL_PERCENT);
Tuple *color_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_LED_COLOR); Tuple *use_custom_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_USE_CUSTOM_LED);
Tuple *color_bg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_BG_COLOR); Tuple *color_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_LED);
Tuple *color_mg_bar_tuple = dict_find(iter, MESSAGE_KEY_CLAY_BAR_MG_COLOR); Tuple *color_bg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BG);
Tuple *color_cool_bar_tuple = dict_find(iter, MESSAGE_KEY_CLAY_BAR_COOL_COLOR); Tuple *color_bar_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_MG);
Tuple *color_hot_bar_tuple = dict_find(iter, MESSAGE_KEY_CLAY_BAR_HOT_COLOR); Tuple *color_bar_cool_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_COOL);
Tuple *color_mg_time_tuple = dict_find(iter, MESSAGE_KEY_CLAY_TIME_MG_COLOR); Tuple *color_bar_hot_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_HOT);
Tuple *color_fg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_FG_COLOR); Tuple *color_time_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_TIME_MG);
Tuple *color_warning_tuple = dict_find(iter, MESSAGE_KEY_CLAY_WARNING_COLOR); Tuple *color_letters_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_LETTERS);
Tuple *color_hours_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_HOURS);
Tuple *color_minutes_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_MINUTES);
Tuple *color_warning_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_WARNING);
if (enable_peek_tuple) { if (enable_peek_tuple) {
settings.EnablePeek = enable_peek_tuple->value->uint8; settings.EnablePeek = enable_peek_tuple->value->uint8;
} }
if (track_bt_tuple) {
settings.TrackBTStatus = track_bt_tuple->value->uint8;
}
if (show_time_mg_tuple) { if (show_time_mg_tuple) {
settings.ShowTimeMG = show_time_mg_tuple->value->uint8; settings.ShowTimeMG = show_time_mg_tuple->value->uint8;
} }
if (use_custom_led_tuple) { if (track_bt_status_tuple) {
settings.UseCustomLED = use_custom_led_tuple->value->uint8; settings.TrackBTStatus = track_bt_status_tuple->value->uint8;
} }
if (date_timeout_tuple) { if (date_timeout_secs_tuple) {
settings.DateTimeoutSecs = date_timeout_tuple->value->uint8; settings.DateTimeoutSecs = date_timeout_secs_tuple->value->uint8;
} }
if (low_fuel_percent_tuple) { if (low_fuel_percent_tuple) {
settings.LowFuelPercent = low_fuel_percent_tuple->value->uint8; settings.LowFuelPercent = low_fuel_percent_tuple->value->uint8;
} }
if (use_custom_led_tuple) {
settings.UseCustomLED = use_custom_led_tuple->value->uint8;
}
if (color_led_tuple) { if (color_led_tuple) {
settings.ColorLED = GColorFromHEX(color_led_tuple->value->int32); settings.ColorLED = GColorFromHEX(color_led_tuple->value->int32);
} }
if (color_bg_tuple) { if (color_bg_tuple) {
settings.ColorBG = GColorFromHEX(color_bg_tuple->value->int32); settings.ColorBG = GColorFromHEX(color_bg_tuple->value->int32);
} }
if (color_mg_bar_tuple) { if (color_bar_mg_tuple) {
settings.ColorMGBars = GColorFromHEX(color_mg_bar_tuple->value->int32); settings.ColorMGBars = GColorFromHEX(color_bar_mg_tuple->value->int32);
} }
if (color_cool_bar_tuple) { if (color_bar_cool_tuple) {
settings.ColorBarsCool = GColorFromHEX(color_cool_bar_tuple->value->int32); settings.ColorBarsCool = GColorFromHEX(color_bar_cool_tuple->value->int32);
} }
if (color_hot_bar_tuple) { if (color_bar_hot_tuple) {
settings.ColorBarsHot = GColorFromHEX(color_hot_bar_tuple->value->int32); settings.ColorBarsHot = GColorFromHEX(color_bar_hot_tuple->value->int32);
} }
if (color_mg_time_tuple) { if (color_time_mg_tuple) {
settings.ColorMGTime = GColorFromHEX(color_mg_time_tuple->value->int32); settings.ColorMGTime = GColorFromHEX(color_time_mg_tuple->value->int32);
} }
if (color_fg_tuple) { if (color_letters_tuple) {
settings.ColorFG = GColorFromHEX(color_fg_tuple->value->int32); settings.ColorLetters = GColorFromHEX(color_letters_tuple->value->int32);
}
if (color_hours_tuple) {
settings.ColorHours = GColorFromHEX(color_hours_tuple->value->int32);
}
if (color_minutes_tuple) {
settings.ColorMinutes = GColorFromHEX(color_minutes_tuple->value->int32);
} }
if (color_warning_tuple) { if (color_warning_tuple) {
settings.ColorWarning = GColorFromHEX(color_warning_tuple->value->int32); settings.ColorWarning = GColorFromHEX(color_warning_tuple->value->int32);
@@ -604,7 +612,9 @@ static void init() {
settings.ColorBarsCool = GColorDukeBlue; settings.ColorBarsCool = GColorDukeBlue;
settings.ColorBarsHot = GColorRed; settings.ColorBarsHot = GColorRed;
settings.ColorMGTime = GColorDarkGray; settings.ColorMGTime = GColorDarkGray;
settings.ColorFG = GColorWhite; settings.ColorLetters = GColorWhite;
settings.ColorHours = GColorWhite;
settings.ColorMinutes = GColorWhite;
settings.ColorWarning = GColorChromeYellow; settings.ColorWarning = GColorChromeYellow;
} }
src/c/settings.h
+5 -3
View File
@@ -5,18 +5,20 @@
typedef struct ClaySettings { typedef struct ClaySettings {
bool EnablePeek; bool EnablePeek;
bool TrackBTStatus;
bool ShowTimeMG; bool ShowTimeMG;
bool UseCustomLED; bool TrackBTStatus;
uint8_t DateTimeoutSecs; uint8_t DateTimeoutSecs;
uint8_t LowFuelPercent; uint8_t LowFuelPercent;
bool UseCustomLED;
GColor ColorLED; GColor ColorLED;
GColor ColorBG; GColor ColorBG;
GColor ColorMGBars; GColor ColorMGBars;
GColor ColorBarsCool; GColor ColorBarsCool;
GColor ColorBarsHot; GColor ColorBarsHot;
GColor ColorMGTime; GColor ColorMGTime;
GColor ColorFG; GColor ColorLetters;
GColor ColorHours;
GColor ColorMinutes;
GColor ColorWarning; GColor ColorWarning;
} __attribute__((__packed__)) ClaySettings; } __attribute__((__packed__)) ClaySettings;
src/pkjs/config.js
+28 -12
View File
@@ -30,14 +30,14 @@ module.exports = [
{ {
"id": "bt_indicator_toggle", "id": "bt_indicator_toggle",
"type": "toggle", "type": "toggle",
"messageKey": "CLAY_BT_INDICATOR", "messageKey": "CLAY_TRACK_BT_STATUS",
"defaultValue": false, "defaultValue": false,
"label": "BT disconnect indicator", "label": "BT disconnect indicator",
"description": "Change the color of the digits to the configured warning color when the connection to the phone is lost." "description": "Change the color of the digits to the configured warning color when the connection to the phone is lost."
}, },
{ {
"type": "slider", "type": "slider",
"messageKey": "CLAY_DATE_TIMEOUT", "messageKey": "CLAY_DATE_TIMEOUT_SECS",
defaultValue: 3, defaultValue: 3,
min: 0, min: 0,
max: 15, max: 15,
@@ -108,7 +108,7 @@ module.exports = [
{ {
"id": "custom_color_led", "id": "custom_color_led",
"type": "color", "type": "color",
"messageKey": "CLAY_LED_COLOR", "messageKey": "CLAY_COLOR_LED",
"defaultValue": "ffffff", "defaultValue": "ffffff",
"label": "Backlight color", "label": "Backlight color",
"sunlight": false, "sunlight": false,
@@ -116,7 +116,7 @@ module.exports = [
{ {
"id": "custom_color_bg", "id": "custom_color_bg",
"type": "color", "type": "color",
"messageKey": "CLAY_BG_COLOR", "messageKey": "CLAY_COLOR_BG",
"defaultValue": "0000ff", "defaultValue": "0000ff",
"label": "Background color", "label": "Background color",
"sunlight": false, "sunlight": false,
@@ -124,7 +124,7 @@ module.exports = [
{ {
"id": "custom_color_mg_bars", "id": "custom_color_mg_bars",
"type": "color", "type": "color",
"messageKey": "CLAY_BAR_MG_COLOR", "messageKey": "CLAY_COLOR_BAR_MG",
"defaultValue": "aaaaaa", "defaultValue": "aaaaaa",
"label": "Bar midground color", "label": "Bar midground color",
"sunlight": false, "sunlight": false,
@@ -132,7 +132,7 @@ module.exports = [
{ {
"id": "custom_color_cool_bars", "id": "custom_color_cool_bars",
"type": "color", "type": "color",
"messageKey": "CLAY_BAR_COOL_COLOR", "messageKey": "CLAY_COLOR_BAR_COOL",
"defaultValue": "0000aa", "defaultValue": "0000aa",
"label": "Bar cold/full color", "label": "Bar cold/full color",
"sunlight": false, "sunlight": false,
@@ -140,7 +140,7 @@ module.exports = [
{ {
"id": "custom_color_hot_bars", "id": "custom_color_hot_bars",
"type": "color", "type": "color",
"messageKey": "CLAY_BAR_HOT_COLOR", "messageKey": "CLAY_COLOR_BAR_HOT",
"defaultValue": "ff0000", "defaultValue": "ff0000",
"label": "Bar hot/empty color", "label": "Bar hot/empty color",
"sunlight": false, "sunlight": false,
@@ -148,23 +148,39 @@ module.exports = [
{ {
"id": "custom_color_mg_time", "id": "custom_color_mg_time",
"type": "color", "type": "color",
"messageKey": "CLAY_TIME_MG_COLOR", "messageKey": "CLAY_COLOR_TIME_MG",
"defaultValue": "555555", "defaultValue": "555555",
"label": "Time segment midground color", "label": "Time segment midground color",
"sunlight": false, "sunlight": false,
}, },
{ {
"id": "custom_color_fg", "id": "custom_color_letters",
"type": "color", "type": "color",
"messageKey": "CLAY_FG_COLOR", "messageKey": "CLAY_COLOR_LETTERS",
"defaultValue": "ffffff", "defaultValue": "ffffff",
"label": "Foreground color", "label": "Letters (C/H/E/F) color",
"sunlight": false,
},
{
"id": "custom_color_hours",
"type": "color",
"messageKey": "CLAY_COLOR_HOURS",
"defaultValue": "ffffff",
"label": "Hours color",
"sunlight": false,
},
{
"id": "custom_color_minutes",
"type": "color",
"messageKey": "CLAY_COLOR_MINUTES",
"defaultValue": "ffffff",
"label": "Minutes color",
"sunlight": false, "sunlight": false,
}, },
{ {
"id": "custom_color_warning", "id": "custom_color_warning",
"type": "color", "type": "color",
"messageKey": "CLAY_WARNING_COLOR", "messageKey": "CLAY_COLOR_WARNING",
"defaultValue": "ffaa00", "defaultValue": "ffaa00",
"label": "Warning indicator color", "label": "Warning indicator color",
"sunlight": false, "sunlight": false,
src/pkjs/customClay.js
+12 -4
View File
@@ -24,7 +24,9 @@ module.exports = function (minified) {
clayConfig.getItemById('custom_color_cool_bars').set('0000aa'); clayConfig.getItemById('custom_color_cool_bars').set('0000aa');
clayConfig.getItemById('custom_color_hot_bars').set('ff0000'); clayConfig.getItemById('custom_color_hot_bars').set('ff0000');
clayConfig.getItemById('custom_color_mg_time').set('555555'); clayConfig.getItemById('custom_color_mg_time').set('555555');
clayConfig.getItemById('custom_color_fg').set('ff0000'); clayConfig.getItemById('custom_color_letters').set('ff0000');
clayConfig.getItemById('custom_color_hours').set('ff0000');
clayConfig.getItemById('custom_color_minutes').set('ff0000');
clayConfig.getItemById('custom_color_warning').set('ffaa00'); clayConfig.getItemById('custom_color_warning').set('ffaa00');
break break
default: default:
@@ -35,7 +37,9 @@ module.exports = function (minified) {
clayConfig.getItemById('custom_color_cool_bars').set('0000aa'); clayConfig.getItemById('custom_color_cool_bars').set('0000aa');
clayConfig.getItemById('custom_color_hot_bars').set('ff0000'); clayConfig.getItemById('custom_color_hot_bars').set('ff0000');
clayConfig.getItemById('custom_color_mg_time').set('555555'); clayConfig.getItemById('custom_color_mg_time').set('555555');
clayConfig.getItemById('custom_color_fg').set('ffffff'); clayConfig.getItemById('custom_color_letters').set('ffffff');
clayConfig.getItemById('custom_color_hours').set('ffffff');
clayConfig.getItemById('custom_color_minutes').set('ffffff');
clayConfig.getItemById('custom_color_warning').set('ffaa00'); clayConfig.getItemById('custom_color_warning').set('ffaa00');
} }
} }
@@ -50,7 +54,9 @@ module.exports = function (minified) {
clayConfig.getItemById('custom_color_cool_bars').show(); clayConfig.getItemById('custom_color_cool_bars').show();
clayConfig.getItemById('custom_color_hot_bars').show(); clayConfig.getItemById('custom_color_hot_bars').show();
clayConfig.getItemById('custom_color_mg_time').show(); clayConfig.getItemById('custom_color_mg_time').show();
clayConfig.getItemById('custom_color_fg').show(); clayConfig.getItemById('custom_color_letters').show();
clayConfig.getItemById('custom_color_hours').show();
clayConfig.getItemById('custom_color_minutes').show();
clayConfig.getItemById('custom_color_warning').show(); clayConfig.getItemById('custom_color_warning').show();
} else { } else {
setColorsToPreset(); setColorsToPreset();
@@ -62,7 +68,9 @@ module.exports = function (minified) {
clayConfig.getItemById('custom_color_cool_bars').hide(); clayConfig.getItemById('custom_color_cool_bars').hide();
clayConfig.getItemById('custom_color_hot_bars').hide(); clayConfig.getItemById('custom_color_hot_bars').hide();
clayConfig.getItemById('custom_color_mg_time').hide(); clayConfig.getItemById('custom_color_mg_time').hide();
clayConfig.getItemById('custom_color_fg').hide(); clayConfig.getItemById('custom_color_letters').hide();
clayConfig.getItemById('custom_color_hours').hide();
clayConfig.getItemById('custom_color_minutes').hide();
clayConfig.getItemById('custom_color_warning').hide(); clayConfig.getItemById('custom_color_warning').hide();
} }
} }