Skip to content

Commit

Permalink
Testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@sukunetsiz
sukunetsiz committed Jan 10, 2025
1 parent 3bfce3d commit 7405167
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
44 changes: 22 additions & 22 deletions main/gui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ struct {
gui_view_node_t* root;

gui_view_node_t* title;
gui_view_node_t* battery_text;
// gui_view_node_t* battery_text;
gui_view_node_t* usb_text;
gui_view_node_t* ble_text;

uint8_t last_battery_val;
// uint8_t last_battery_val;
bool last_usb_val;
bool last_ble_val;
uint8_t battery_update_counter;
// uint8_t battery_update_counter;

TaskHandle_t task_handle;

Expand Down Expand Up @@ -180,9 +180,9 @@ static void make_status_bar(void)
gui_set_align(status_bar.ble_text, GUI_ALIGN_CENTER, GUI_ALIGN_MIDDLE);
gui_set_parent(status_bar.ble_text, status_parent);

gui_make_text_font(&status_bar.battery_text, "0", TFT_WHITE, JADE_SYMBOLS_16x32_FONT);
gui_set_align(status_bar.battery_text, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
gui_set_parent(status_bar.battery_text, status_parent);
// gui_make_text_font(&status_bar.battery_text, "0", TFT_WHITE, JADE_SYMBOLS_16x32_FONT);
// gui_set_align(status_bar.battery_text, GUI_ALIGN_RIGHT, GUI_ALIGN_MIDDLE);
// gui_set_parent(status_bar.battery_text, status_parent);

JADE_ASSERT(name_parent);
JADE_ASSERT(name_parent->kind == FILL);
Expand Down Expand Up @@ -2168,22 +2168,22 @@ static bool update_status_bar(const bool force_redraw)
}
}

if (status_bar.battery_update_counter == 0) {
uint8_t new_bat = power_get_battery_status();
color_t color = new_bat == 0 ? TFT_RED : new_bat == 1 ? TFT_ORANGE : TFT_WHITE;
if (power_get_battery_charging()) {
new_bat = new_bat + 12;
}
if (new_bat != status_bar.last_battery_val) {
status_bar.last_battery_val = new_bat;
gui_set_color(status_bar.battery_text, color);
gui_update_text_node_text(status_bar.battery_text, (char[]){ new_bat + '0', '\0' });
status_bar.updated = true;
}
status_bar.battery_update_counter = 60;
}

status_bar.battery_update_counter--;
// if (status_bar.battery_update_counter == 0) {
// uint8_t new_bat = power_get_battery_status();
// color_t color = new_bat == 0 ? TFT_RED : new_bat == 1 ? TFT_ORANGE : TFT_WHITE;
// if (power_get_battery_charging()) {
// new_bat = new_bat + 12;
// }
// if (new_bat != status_bar.last_battery_val) {
// status_bar.last_battery_val = new_bat;
// gui_set_color(status_bar.battery_text, color);
// gui_update_text_node_text(status_bar.battery_text, (char[]){ new_bat + '0', '\0' });
// status_bar.updated = true;
// }
// status_bar.battery_update_counter = 60;
// }
//
// status_bar.battery_update_counter--;

if (status_bar.updated || force_redraw) {
render_node(status_bar.root, status_bar_cs, 0);
Expand Down
10 changes: 5 additions & 5 deletions main/ui/dashboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ gui_activity_t* make_uninitialised_settings_activity(void)
btn_data_t menubtns[]
= {
#ifdef CONFIG_IDF_TARGET_ESP32S3
{ .txt = "USB Storage", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_USBSTORAGE },
{ .txt = "USB Depolama", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_USBSTORAGE },
#endif
{ .txt = "BIP39 Kelimeleri", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_BIP39_PASSPHRASE },
{ .txt = "Ayarlar", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_PREFS } };
Expand All @@ -315,7 +315,7 @@ gui_activity_t* make_unlocked_settings_activity(void)
btn_data_t menubtns[] = { { .txt = "Wallet", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_WALLET },
{ .txt = "Cihaz", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_DEVICE },
#ifdef CONFIG_IDF_TARGET_ESP32S3
{ .txt = "USB Storage", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_USBSTORAGE },
{ .txt = "USB Depolama", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_USBSTORAGE },
#endif
{ .txt = "Authentication", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_AUTHENTICATION } };

Expand Down Expand Up @@ -346,7 +346,7 @@ gui_activity_t* make_usbstorage_settings_activity(const bool unlocked)
//{ .txt = "Export", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_USBSTORAGE_EXPORT },
};

return make_menu_activity("USB Storage", hdrbtns, 2, menubtns, unlocked ? 2 : 1);
return make_menu_activity("USB Depolama", hdrbtns, 2, menubtns, unlocked ? 2 : 1);
}
#endif

Expand Down Expand Up @@ -627,7 +627,7 @@ gui_activity_t* make_device_info_activity(void)

btn_data_t menubtns[] = { { .txt = "MAC Address", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_DEVICE_INFO_MAC },
{ .txt = "Battery Volts", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_DEVICE_INFO_BATTERY },
{ .txt = "Storage", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_DEVICE_INFO_STORAGE } };
{ .txt = "Depolama", .font = GUI_DEFAULT_FONT, .ev_id = BTN_SETTINGS_DEVICE_INFO_STORAGE } };

return make_menu_activity("Cihaz Bilgisi", hdrbtns, 2, menubtns, 3);
}
Expand Down Expand Up @@ -785,7 +785,7 @@ gui_activity_t* make_storage_stats_activity(const size_t entries_used, const siz
{ .txt = NULL, .font = GUI_DEFAULT_FONT, .ev_id = GUI_BUTTON_EVENT_NONE } };

gui_activity_t* const act = gui_make_activity();
gui_view_node_t* const parent = add_title_bar(act, "Storage", hdrbtns, 2, NULL);
gui_view_node_t* const parent = add_title_bar(act, "Depolama", hdrbtns, 2, NULL);
gui_view_node_t* hsplit;
gui_view_node_t* node;

Expand Down

0 comments on commit 7405167

Please sign in to comment.