feat: add bluetooth button and remove wifi one

Author: electricalgorithm

src/user_interface/components/ui_comp_hook.c

@@ -1,5 +1,5 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 

src/user_interface/screens/ui_CalenderScreen.c

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #include "../ui.h"

src/user_interface/screens/ui_HomeScreen.c

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #include "../ui.h"

src/user_interface/screens/ui_SettingsScreen.c

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #include "../ui.h"
@@ -41,19 +41,6 @@ lv_obj_set_style_shadow_spread(ui_BrightnessSlider, 1, LV_PART_KNOB| LV_STATE_DE
 lv_obj_set_style_shadow_ofs_x(ui_BrightnessSlider, 2, LV_PART_KNOB| LV_STATE_DEFAULT);
 lv_obj_set_style_shadow_ofs_y(ui_BrightnessSlider, 2, LV_PART_KNOB| LV_STATE_DEFAULT);
 
-ui_WiFiSettings = lv_dropdown_create(ui_SettingsScreen);
-lv_dropdown_set_options( ui_WiFiSettings, "Przystan na Kawe\nKOCMARLI\nTest" );
-lv_dropdown_set_text( ui_WiFiSettings, "None");
-lv_obj_set_width( ui_WiFiSettings, 100);
-lv_obj_set_height( ui_WiFiSettings, LV_SIZE_CONTENT);   /// 1
-lv_obj_set_x( ui_WiFiSettings, 50 );
-lv_obj_set_y( ui_WiFiSettings, 1 );
-lv_obj_set_align( ui_WiFiSettings, LV_ALIGN_CENTER );
-lv_obj_add_flag( ui_WiFiSettings, LV_OBJ_FLAG_SCROLL_ON_FOCUS );   /// Flags
-lv_obj_clear_flag( ui_WiFiSettings, LV_OBJ_FLAG_CLICKABLE );    /// Flags
-
-
-
 ui_BrightnessLabel = lv_label_create(ui_SettingsScreen);
 lv_obj_set_width( ui_BrightnessLabel, LV_SIZE_CONTENT);  /// 1
 lv_obj_set_height( ui_BrightnessLabel, LV_SIZE_CONTENT);   /// 1
@@ -62,13 +49,13 @@ lv_obj_set_y( ui_BrightnessLabel, -35 );
 lv_obj_set_align( ui_BrightnessLabel, LV_ALIGN_CENTER );
 lv_label_set_text(ui_BrightnessLabel,"Brightness");
 
-ui_WiFiLabel = lv_label_create(ui_SettingsScreen);
-lv_obj_set_width( ui_WiFiLabel, LV_SIZE_CONTENT);  /// 1
-lv_obj_set_height( ui_WiFiLabel, LV_SIZE_CONTENT);   /// 1
-lv_obj_set_x( ui_WiFiLabel, -38 );
-lv_obj_set_y( ui_WiFiLabel, 0 );
-lv_obj_set_align( ui_WiFiLabel, LV_ALIGN_CENTER );
-lv_label_set_text(ui_WiFiLabel,"WiFi");
+ui_BLELabel = lv_label_create(ui_SettingsScreen);
+lv_obj_set_width( ui_BLELabel, LV_SIZE_CONTENT);  /// 1
+lv_obj_set_height( ui_BLELabel, LV_SIZE_CONTENT);   /// 1
+lv_obj_set_x( ui_BLELabel, -56 );
+lv_obj_set_y( ui_BLELabel, 0 );
+lv_obj_set_align( ui_BLELabel, LV_ALIGN_CENTER );
+lv_label_set_text(ui_BLELabel,"Bluetooth");
 
 ui_VersionText = lv_label_create(ui_SettingsScreen);
 lv_obj_set_width( ui_VersionText, LV_SIZE_CONTENT);  /// 1
@@ -78,8 +65,16 @@ lv_obj_set_y( ui_VersionText, 72 );
 lv_obj_set_align( ui_VersionText, LV_ALIGN_CENTER );
 lv_label_set_text(ui_VersionText,"Version: 0.1.0");
 
+ui_BluetoothSwitch = lv_switch_create(ui_SettingsScreen);
+lv_obj_set_width( ui_BluetoothSwitch, 54);
+lv_obj_set_height( ui_BluetoothSwitch, 25);
+lv_obj_set_x( ui_BluetoothSwitch, 49 );
+lv_obj_set_y( ui_BluetoothSwitch, -1 );
+lv_obj_set_align( ui_BluetoothSwitch, LV_ALIGN_CENTER );
+
+
 lv_obj_add_event_cb(ui_BrightnessSlider, ui_event_BrightnessSlider, LV_EVENT_ALL, NULL);
-lv_obj_add_event_cb(ui_WiFiSettings, ui_event_WiFiSettings, LV_EVENT_ALL, NULL);
+lv_obj_add_event_cb(ui_BluetoothSwitch, ui_event_BluetoothSwitch, LV_EVENT_ALL, NULL);
 lv_obj_add_event_cb(ui_SettingsScreen, ui_event_SettingsScreen, LV_EVENT_ALL, NULL);
 
 }

src/user_interface/ui.c

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #include "ui.h"
@@ -25,13 +25,13 @@ void ui_event_SettingsScreen( lv_event_t * e);
 lv_obj_t *ui_SettingsScreen;
 lv_obj_t *ui_SettingsTitle;
 lv_obj_t *ui_BackgroundPanel;
-void ui_event_BrightnessSlider(lv_event_t *e);
+void ui_event_BrightnessSlider( lv_event_t * e);
 lv_obj_t *ui_BrightnessSlider;
-void ui_event_WiFiSettings( lv_event_t * e);
-lv_obj_t *ui_WiFiSettings;
 lv_obj_t *ui_BrightnessLabel;
-lv_obj_t *ui_WiFiLabel;
+lv_obj_t *ui_BLELabel;
 lv_obj_t *ui_VersionText;
+void ui_event_BluetoothSwitch( lv_event_t * e);
+lv_obj_t *ui_BluetoothSwitch;
 
 
 // SCREEN: ui_CalenderScreen
@@ -70,16 +70,16 @@ lv_indev_wait_release(lv_indev_get_act());
       _ui_screen_change( &ui_HomeScreen, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_HomeScreen_screen_init);
 }
 }
-void ui_event_BrightnessSlider(lv_event_t * e) {
+void ui_event_BrightnessSlider( lv_event_t * e) {
     lv_event_code_t event_code = lv_event_get_code(e);lv_obj_t * target = lv_event_get_target(e);
 if ( event_code == LV_EVENT_VALUE_CHANGED) {
-      brightness_changed_callback(target, e);
+      brightness_changed_callback( e );
 }
 }
-void ui_event_WiFiSettings( lv_event_t * e) {
+void ui_event_BluetoothSwitch( lv_event_t * e) {
     lv_event_code_t event_code = lv_event_get_code(e);lv_obj_t * target = lv_event_get_target(e);
 if ( event_code == LV_EVENT_VALUE_CHANGED) {
-      wifi_value_changed( e );
+      ble_switch_callback( e );
 }
 }
 void ui_event_CalenderScreen( lv_event_t * e) {

src/user_interface/ui.h

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #ifndef _SMART_WATCH_UI_UI_H
@@ -24,6 +24,7 @@ extern "C" {
 
 #include "ui_helpers.h"
 #include "ui_events.h"
+
 // SCREEN: ui_HomeScreen
 void ui_HomeScreen_screen_init(void);
 void ui_event_HomeScreen( lv_event_t * e);
@@ -38,13 +39,13 @@ void ui_event_SettingsScreen( lv_event_t * e);
 extern lv_obj_t *ui_SettingsScreen;
 extern lv_obj_t *ui_SettingsTitle;
 extern lv_obj_t *ui_BackgroundPanel;
-void ui_event_BrightnessSlider(lv_event_t * e);
+void ui_event_BrightnessSlider( lv_event_t * e);
 extern lv_obj_t *ui_BrightnessSlider;
-void ui_event_WiFiSettings( lv_event_t * e);
-extern lv_obj_t *ui_WiFiSettings;
 extern lv_obj_t *ui_BrightnessLabel;
-extern lv_obj_t *ui_WiFiLabel;
+extern lv_obj_t *ui_BLELabel;
 extern lv_obj_t *ui_VersionText;
+void ui_event_BluetoothSwitch( lv_event_t * e);
+extern lv_obj_t *ui_BluetoothSwitch;
 // SCREEN: ui_CalenderScreen
 void ui_CalenderScreen_screen_init(void);
 void ui_event_CalenderScreen( lv_event_t * e);
@@ -55,6 +56,7 @@ extern lv_obj_t *ui____initial_actions0;
 
 
 
+
 void ui_init(void);
 
 #ifdef __cplusplus

src/user_interface/ui_events.c

@@ -9,23 +9,38 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/pwm.h>
-#define LOG_LEVEL	CONFIG_LOG_DEFAULT_LEVEL
+
+#include "../bluetooth/bluetooth_infra.h"
+
 LOG_MODULE_REGISTER(LVGL_Callbacks, LOG_LEVEL_INF);
 
 
-void wifi_value_changed(lv_event_t * e)
-{
-	// Your code here
+void ble_switch_callback(lv_event_t * e) {
+    int8_t ret;
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * obj = lv_event_get_target(e);
+    if(lv_obj_has_state(obj, LV_STATE_CHECKED)) {
+        // Enable Bluetooth and start advertisement.
+        ret = enable_bluetooth_and_start_advertisement();
+        if (ret < 0) LOG_ERR("Failed to enable Bluetooth and start advertisement, exiting...");
+        else LOG_INF("Bluetooth enabled and advertisement started.");
+    } else {
+        // Disable Bluetooth and stop advertisement.
+        ret = disable_bluetooth_and_stop_advertisement();
+        if (ret < 0) LOG_ERR("Failed to disable Bluetooth and stop advertisement, exiting...");
+        else LOG_INF("Bluetooth disabled and advertisement stopped.");
+    }
 }
 
-void brightness_changed_callback(lv_obj_t * target, lv_event_t * e) {
+void brightness_changed_callback(lv_event_t * e) {
+    lv_obj_t * obj = lv_event_get_target(e);
 	const struct pwm_dt_spec backlight = PWM_DT_SPEC_GET_BY_IDX(DT_NODELABEL(pwm_lcd0), 0);
     if (!pwm_is_ready_dt(&backlight)) {
         LOG_ERR("PWM device is not ready, exiting...");
     }
 
 	// Normalize the slider value from 0-100 to 100-1000 range.
-	int value = lv_slider_get_value(target);
+	int value = lv_slider_get_value(obj);
 	value = (value * 9) + 100;
 
     // Change the PWM pulse width according to slider value.

src/user_interface/ui_events.h

@@ -10,8 +10,8 @@
 extern "C" {
 #endif
 
-void brightness_changed_callback(lv_obj_t * target, lv_event_t * e);
-void wifi_value_changed(lv_event_t * e);
+void brightness_changed_callback(lv_event_t * e);
+void ble_switch_callback(lv_event_t * e);
 
 #ifdef __cplusplus
 } /*extern "C"*/

src/user_interface/ui_helpers.c

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #include "ui_helpers.h"
@@ -108,6 +108,15 @@ void _ui_state_modify( lv_obj_t *target, int32_t state, int value)
     else lv_obj_clear_state(target,state);
 }
 
+void _ui_textarea_move_cursor(lv_obj_t * target, int val)
+{
+    if (val==UI_MOVE_CURSOR_UP) lv_textarea_cursor_up(target);
+    if (val==UI_MOVE_CURSOR_RIGHT) lv_textarea_cursor_right(target);
+    if (val==UI_MOVE_CURSOR_DOWN) lv_textarea_cursor_down(target);
+    if (val==UI_MOVE_CURSOR_LEFT) lv_textarea_cursor_left(target);
+    lv_obj_add_state(target, LV_STATE_FOCUSED);
+}
+
 void scr_unloaded_delete_cb(lv_event_t * e)
 {
    lv_obj_t ** var = lv_event_get_user_data(e);
@@ -244,3 +253,18 @@ void _ui_checked_set_text_value( lv_obj_t *trg, lv_obj_t *src, const char *txt_o
     else lv_label_set_text(trg,txt_off);
 }
 
+void _ui_spinbox_step(lv_obj_t * target, int val)
+{
+	if(val > 0) lv_spinbox_increment(target);
+	else lv_spinbox_decrement(target);
+
+	lv_event_send(target,LV_EVENT_VALUE_CHANGED, 0);
+}
+
+void _ui_switch_theme(int val)
+{
+#ifdef UI_THEME_ACTIVE
+    ui_theme_set(val);
+#endif
+}
+

src/user_interface/ui_helpers.h

@@ -1,6 +1,6 @@
 // This file was generated by SquareLine Studio
-// SquareLine Studio version: SquareLine Studio 1.3.3
-// LVGL version: 8.2.0
+// SquareLine Studio version: SquareLine Studio 1.4.0
+// LVGL version: 8.3.6
 // Project name: smart_watch_ui
 
 #ifndef _SMART_WATCH_UI_UI_HELPERS_H
@@ -62,6 +62,12 @@ void _ui_flag_modify( lv_obj_t *target, int32_t flag, int value);
 #define _UI_MODIFY_STATE_TOGGLE 2
 void _ui_state_modify( lv_obj_t *target, int32_t state, int value);
 
+#define UI_MOVE_CURSOR_UP 0
+#define UI_MOVE_CURSOR_RIGHT 1
+#define UI_MOVE_CURSOR_DOWN 2
+#define UI_MOVE_CURSOR_LEFT 3
+void _ui_textarea_move_cursor(lv_obj_t * target, int val);
+
 void scr_unloaded_delete_cb(lv_event_t * e);
 
 void _ui_opacity_set( lv_obj_t *target, int val);
@@ -113,6 +119,10 @@ void _ui_slider_set_text_value( lv_obj_t *trg, lv_obj_t *src, const char *prefix
 
 void _ui_checked_set_text_value( lv_obj_t *trg, lv_obj_t *src, const char *txt_on, const char *txt_off);
 
+void _ui_spinbox_step(lv_obj_t * target, int val);
+
+void _ui_switch_theme(int val);
+
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif