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

Reduce code duplication in received handler

Browse Source
This commit is contained in:
Randall Winkhart
2026-06-28 17:51:42 -04:00
parent b36fd4c8bf
commit 8b44eefd77
4 changed files with 42 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -29,7 +29,7 @@
"PKJS_READY", "PKJS_READY",
"PKJS_TEMP_BAR_COUNT", "PKJS_TEMP_BAR_COUNT",
"CLAY_ENABLE_PEEK", "CLAY_ENABLE_PEEK",
"CLAY_SHOW_TIME_MG", "CLAY_SHOW_DIGITS_MG",
"CLAY_TRACK_BT_STATUS", "CLAY_TRACK_BT_STATUS",
"CLAY_DATE_TIMEOUT_SECS", "CLAY_DATE_TIMEOUT_SECS",
"CLAY_LOW_FUEL_PERCENT", "CLAY_LOW_FUEL_PERCENT",
@@ -40,7 +40,7 @@
"CLAY_COLOR_BAR_FILL", "CLAY_COLOR_BAR_FILL",
"CLAY_COLOR_BAR_COOL", "CLAY_COLOR_BAR_COOL",
"CLAY_COLOR_BAR_HOT", "CLAY_COLOR_BAR_HOT",
"CLAY_COLOR_TIME_MG", "CLAY_COLOR_DIGITS_MG",
"CLAY_COLOR_LETTERS", "CLAY_COLOR_LETTERS",
"CLAY_COLOR_HOURS", "CLAY_COLOR_HOURS",
"CLAY_COLOR_MINUTES", "CLAY_COLOR_MINUTES",
src/c/main.c
+36 -62
View File
@@ -108,7 +108,7 @@ static void recolor_digit_bitmaps(GBitmap **bitmaps, GColor *applied, GColor new
static void bt_callback(bool connected) { static void bt_callback(bool connected) {
GColor dst = connected ? settings.ColorHours : settings.ColorWarning; GColor dst = connected ? settings.ColorHours : settings.ColorWarning;
if (s_first_settings_application && connected && dst.argb == s_applied_hour.argb) { if (s_first_settings_application && connected && dst.argb == s_applied_hour.argb) {
// at startup, s_applied_time_date.argb is GColorWhite // at startup, s_applied_hour.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
return; return;
} }
@@ -217,7 +217,7 @@ static void update_minute_1() {
s_time_digits[3] = minute % 10; s_time_digits[3] = minute % 10;
if (!s_peek_active) { if (!s_peek_active) {
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
bitmap_layer_set_bitmap(s_digit_mg_layers[2], s_digit_mg_super8); bitmap_layer_set_bitmap(s_digit_mg_layers[2], s_digit_mg_super8);
bitmap_layer_set_bitmap(s_digit_mg_layers[3], s_digit_mg_super8); bitmap_layer_set_bitmap(s_digit_mg_layers[3], s_digit_mg_super8);
} }
@@ -226,7 +226,7 @@ static void update_minute_1() {
bitmap_layer_set_bitmap(s_digit_fg_layers[2], s_minute_bitmaps[s_time_digits[2]]); bitmap_layer_set_bitmap(s_digit_fg_layers[2], s_minute_bitmaps[s_time_digits[2]]);
bitmap_layer_set_bitmap(s_digit_fg_layers[3], s_minute_bitmaps[s_time_digits[3]]); bitmap_layer_set_bitmap(s_digit_fg_layers[3], s_minute_bitmaps[s_time_digits[3]]);
} else { } else {
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
bitmap_layer_set_bitmap(s_digit_mg_layers[2], s_digit_mg_super8_mini); bitmap_layer_set_bitmap(s_digit_mg_layers[2], s_digit_mg_super8_mini);
bitmap_layer_set_bitmap(s_digit_mg_layers[3], s_digit_mg_super8_mini); bitmap_layer_set_bitmap(s_digit_mg_layers[3], s_digit_mg_super8_mini);
} }
@@ -294,7 +294,7 @@ static void peek_change(AnimationProgress progress, void *context) {
if (!s_peek_active) { if (!s_peek_active) {
layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[2]), s_digit_grects[2]); layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[2]), s_digit_grects[2]);
layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[3]), s_digit_grects[3]); layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[3]), s_digit_grects[3]);
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[2]), s_digit_grects[2]); layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[2]), s_digit_grects[2]);
layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[3]), s_digit_grects[3]); layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[3]), s_digit_grects[3]);
} }
@@ -302,7 +302,7 @@ static void peek_change(AnimationProgress progress, void *context) {
uint8_t y = s_digit_grects[2].origin.y - 1; uint8_t y = s_digit_grects[2].origin.y - 1;
layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[2]), GRect(s_digit_grects[2].origin.x, y, 69, 54)); layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[2]), GRect(s_digit_grects[2].origin.x, y, 69, 54));
layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[3]), GRect(s_digit_grects[3].origin.x, y, 69, 54)); layer_set_frame(bitmap_layer_get_layer(s_digit_fg_layers[3]), GRect(s_digit_grects[3].origin.x, y, 69, 54));
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[2]), GRect(s_digit_grects[2].origin.x, y, 69, 54)); layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[2]), GRect(s_digit_grects[2].origin.x, y, 69, 54));
layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[3]), GRect(s_digit_grects[3].origin.x, y, 69, 54)); layer_set_frame(bitmap_layer_get_layer(s_digit_mg_layers[3]), GRect(s_digit_grects[3].origin.x, y, 69, 54));
} }
@@ -328,7 +328,7 @@ static void apply_settings() {
window_set_background_color(s_main_window, settings.ColorBG); window_set_background_color(s_main_window, settings.ColorBG);
// TIME MG // TIME MG
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
//// load bitmap if not already loaded //// load bitmap if not already loaded
if (!s_digit_mg_super8) { if (!s_digit_mg_super8) {
s_digit_mg_super8 = gbitmap_create_with_resource(RESOURCE_ID_SUPER8); s_digit_mg_super8 = gbitmap_create_with_resource(RESOURCE_ID_SUPER8);
@@ -354,14 +354,14 @@ static void apply_settings() {
} }
} }
//// set bitmap color and mark layers dirty //// set bitmap color and mark layers dirty
if (s_digit_mg_super8 && settings.ColorMGDigits.argb != s_applied_digits_mg.argb) { if (s_digit_mg_super8 && settings.ColorDigitsMG.argb != s_applied_digits_mg.argb) {
replace_gbitmap_color(s_applied_digits_mg, settings.ColorMGDigits, s_digit_mg_super8, NULL); replace_gbitmap_color(s_applied_digits_mg, settings.ColorDigitsMG, s_digit_mg_super8, NULL);
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
if (s_digit_mg_layers[i]) { if (s_digit_mg_layers[i]) {
layer_mark_dirty(bitmap_layer_get_layer(s_digit_mg_layers[i])); layer_mark_dirty(bitmap_layer_get_layer(s_digit_mg_layers[i]));
} }
} }
s_applied_digits_mg = settings.ColorMGDigits; s_applied_digits_mg = settings.ColorDigitsMG;
} }
} else { } else {
if (s_digit_mg_super8) { if (s_digit_mg_super8) {
@@ -448,19 +448,19 @@ static void apply_settings() {
force_update_minutes = true; force_update_minutes = true;
// mg handling // mg handling
if (settings.ShowTimeMG) { if (settings.ShowDigitsMG) {
if (!s_digit_mg_super8_mini) { if (!s_digit_mg_super8_mini) {
s_digit_mg_super8_mini = gbitmap_create_with_resource(RESOURCE_ID_SUPER8_M); s_digit_mg_super8_mini = gbitmap_create_with_resource(RESOURCE_ID_SUPER8_M);
s_applied_digits_mg_mini = GColorDarkGray; s_applied_digits_mg_mini = GColorDarkGray;
} }
if (settings.ColorMGDigits.argb != s_applied_digits_mg_mini.argb) { if (settings.ColorDigitsMG.argb != s_applied_digits_mg_mini.argb) {
replace_gbitmap_color(s_applied_digits_mg_mini, settings.ColorMGDigits, s_digit_mg_super8_mini, NULL); replace_gbitmap_color(s_applied_digits_mg_mini, settings.ColorDigitsMG, s_digit_mg_super8_mini, NULL);
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
if (s_digit_mg_layers[i]) { if (s_digit_mg_layers[i]) {
layer_mark_dirty(bitmap_layer_get_layer(s_digit_mg_layers[i])); layer_mark_dirty(bitmap_layer_get_layer(s_digit_mg_layers[i]));
} }
} }
s_applied_digits_mg_mini = settings.ColorMGDigits; s_applied_digits_mg_mini = settings.ColorDigitsMG;
} }
} else if (s_digit_mg_super8_mini) { } else if (s_digit_mg_super8_mini) {
gbitmap_destroy(s_digit_mg_super8_mini); gbitmap_destroy(s_digit_mg_super8_mini);
@@ -568,6 +568,13 @@ static void main_window_unload() {
} }
} }
static void apply_color_from_tuple(DictionaryIterator *iter, uint32_t key, GColor *dest) {
Tuple *t = dict_find(iter, key);
if (!t)
return;
*dest = GColorFromHEX(t->value->int32);
}
static void inbox_received_handler(DictionaryIterator *iter, void *context) { static void inbox_received_handler(DictionaryIterator *iter, void *context) {
Tuple *ready_tuple = dict_find(iter, MESSAGE_KEY_PKJS_READY); Tuple *ready_tuple = dict_find(iter, MESSAGE_KEY_PKJS_READY);
if (ready_tuple) { if (ready_tuple) {
@@ -592,27 +599,27 @@ 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 *show_time_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_SHOW_TIME_MG); Tuple *show_digits_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_SHOW_DIGITS_MG);
Tuple *track_bt_status_tuple = dict_find(iter, MESSAGE_KEY_CLAY_TRACK_BT_STATUS); Tuple *track_bt_status_tuple = dict_find(iter, MESSAGE_KEY_CLAY_TRACK_BT_STATUS);
Tuple *date_timeout_secs_tuple = dict_find(iter, MESSAGE_KEY_CLAY_DATE_TIMEOUT_SECS); 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 *use_custom_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_USE_CUSTOM_LED); Tuple *use_custom_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_USE_CUSTOM_LED);
Tuple *color_led_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_LED); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_LED, &settings.ColorLED);
Tuple *color_bg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BG); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_BG, &settings.ColorBG);
Tuple *color_bar_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_MG); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_BAR_MG, &settings.ColorBarsMG);
Tuple *color_bar_fill_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_FILL); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_BAR_FILL, &settings.ColorBarsFill);
Tuple *color_bar_cool_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_COOL); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_BAR_COOL, &settings.ColorBarsCool);
Tuple *color_bar_hot_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_BAR_HOT); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_BAR_HOT, &settings.ColorBarsHot);
Tuple *color_time_mg_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_TIME_MG); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_DIGITS_MG, &settings.ColorDigitsMG);
Tuple *color_letters_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_LETTERS); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_LETTERS, &settings.ColorLetters);
Tuple *color_hours_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_HOURS); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_HOURS, &settings.ColorHours);
Tuple *color_minutes_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_MINUTES); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_MINUTES, &settings.ColorMinutes);
Tuple *color_warning_tuple = dict_find(iter, MESSAGE_KEY_CLAY_COLOR_WARNING); apply_color_from_tuple(iter, MESSAGE_KEY_CLAY_COLOR_WARNING, &settings.ColorWarning);
if (enable_peek_tuple) { if (enable_peek_tuple) {
settings.EnablePeek = enable_peek_tuple->value->uint8; settings.EnablePeek = enable_peek_tuple->value->uint8;
} }
if (show_time_mg_tuple) { if (show_digits_mg_tuple) {
settings.ShowTimeMG = show_time_mg_tuple->value->uint8; settings.ShowDigitsMG = show_digits_mg_tuple->value->uint8;
} }
if (track_bt_status_tuple) { if (track_bt_status_tuple) {
settings.TrackBTStatus = track_bt_status_tuple->value->uint8; settings.TrackBTStatus = track_bt_status_tuple->value->uint8;
@@ -626,39 +633,6 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
if (use_custom_led_tuple) { if (use_custom_led_tuple) {
settings.UseCustomLED = use_custom_led_tuple->value->uint8; settings.UseCustomLED = use_custom_led_tuple->value->uint8;
} }
if (color_led_tuple) {
settings.ColorLED = GColorFromHEX(color_led_tuple->value->int32);
}
if (color_bg_tuple) {
settings.ColorBG = GColorFromHEX(color_bg_tuple->value->int32);
}
if (color_bar_mg_tuple) {
settings.ColorBarsMG = GColorFromHEX(color_bar_mg_tuple->value->int32);
}
if (color_bar_fill_tuple) {
settings.ColorBarsFill = GColorFromHEX(color_bar_fill_tuple->value->int32);
}
if (color_bar_cool_tuple) {
settings.ColorBarsCool = GColorFromHEX(color_bar_cool_tuple->value->int32);
}
if (color_bar_hot_tuple) {
settings.ColorBarsHot = GColorFromHEX(color_bar_hot_tuple->value->int32);
}
if (color_time_mg_tuple) {
settings.ColorMGDigits = GColorFromHEX(color_time_mg_tuple->value->int32);
}
if (color_letters_tuple) {
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) {
settings.ColorWarning = GColorFromHEX(color_warning_tuple->value->int32);
}
persist_write_data(STORAGE_KEY_SETTINGS, &settings, sizeof(settings)); persist_write_data(STORAGE_KEY_SETTINGS, &settings, sizeof(settings));
apply_settings(); apply_settings();
} }
@@ -670,7 +644,7 @@ static void init() {
} else { } else {
settings.EnablePeek = true; settings.EnablePeek = true;
settings.TrackBTStatus = false; settings.TrackBTStatus = false;
settings.ShowTimeMG = false; settings.ShowDigitsMG = false;
settings.UseCustomLED = false; settings.UseCustomLED = false;
settings.DateTimeoutSecs = 3; settings.DateTimeoutSecs = 3;
settings.LowFuelPercent = 20; settings.LowFuelPercent = 20;
@@ -680,7 +654,7 @@ static void init() {
settings.ColorBarsFill = GColorWhite; settings.ColorBarsFill = GColorWhite;
settings.ColorBarsCool = GColorDukeBlue; settings.ColorBarsCool = GColorDukeBlue;
settings.ColorBarsHot = GColorRed; settings.ColorBarsHot = GColorRed;
settings.ColorMGDigits = GColorDarkGray; settings.ColorDigitsMG = GColorDarkGray;
settings.ColorLetters = GColorWhite; settings.ColorLetters = GColorWhite;
settings.ColorHours = GColorWhite; settings.ColorHours = GColorWhite;
settings.ColorMinutes = GColorWhite; settings.ColorMinutes = GColorWhite;
src/c/settings.h
+2 -2
View File
@@ -5,7 +5,7 @@
typedef struct ClaySettings { typedef struct ClaySettings {
bool EnablePeek; bool EnablePeek;
bool ShowTimeMG; bool ShowDigitsMG;
bool TrackBTStatus; bool TrackBTStatus;
uint8_t DateTimeoutSecs; uint8_t DateTimeoutSecs;
uint8_t LowFuelPercent; uint8_t LowFuelPercent;
@@ -16,7 +16,7 @@ typedef struct ClaySettings {
GColor ColorBarsFill; GColor ColorBarsFill;
GColor ColorBarsCool; GColor ColorBarsCool;
GColor ColorBarsHot; GColor ColorBarsHot;
GColor ColorMGDigits; GColor ColorDigitsMG;
GColor ColorLetters; GColor ColorLetters;
GColor ColorHours; GColor ColorHours;
GColor ColorMinutes; GColor ColorMinutes;
src/pkjs/config.js
+2 -2
View File
@@ -22,7 +22,7 @@ module.exports = [
{ {
"id": "time_mg_toggle", "id": "time_mg_toggle",
"type": "toggle", "type": "toggle",
"messageKey": "CLAY_SHOW_TIME_MG", "messageKey": "CLAY_SHOW_DIGITS_MG",
"defaultValue": false, "defaultValue": false,
"label": "Show time segments midground", "label": "Show time segments midground",
"description": "Show or hide the unlit segments behind the time." "description": "Show or hide the unlit segments behind the time."
@@ -172,7 +172,7 @@ module.exports = [
{ {
"id": "custom_color_mg_time", "id": "custom_color_mg_time",
"type": "color", "type": "color",
"messageKey": "CLAY_COLOR_TIME_MG", "messageKey": "CLAY_COLOR_DIGITS_MG",
"defaultValue": "555555", "defaultValue": "555555",
"label": "Time segment midground color", "label": "Time segment midground color",
"sunlight": true, "sunlight": true,