let's start from scratch with a better implementation

Author: electricalgorithm

CMakeLists.txt

@@ -1,4 +1,5 @@
 set(BOARD esp32s3_touch_lcd_1_28/esp32s3/procpu)
+set(DTC_OVERLAY_FILE boards/esp32.overlay)
 
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
@@ -7,5 +8,4 @@ project(Esp32SmartWatch)
 file(GLOB_RECURSE app_sources src/*.c)
 
 target_sources(app PRIVATE ${app_sources})
-target_include_directories(app PRIVATE inc)
-
+target_include_directories(app PRIVATE src/)

README.md

@@ -0,0 +1,22 @@
+# ESP32 Zephyr RTOS Watch
+
+**Supported Boards:**
+- [ESP32-S3-Touch-LCD-1.28](https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-1.28)
+
+## Build Instructions
+1. Install the Zephyr according the information in their website.
+2. Get the ESP32 HAL using `west blobs fetch hal_espressif`.
+3. Clone the package and build it using the instructions provided.
+```sh
+$ west build -p always . --board esp32s3_touch_lcd_1_28/esp32s3/procpu
+```
+4. After the build, flash the firmware to the board.
+```sh
+$ west flash
+```
+5. All done!
+
+## Monitoring
+```sh
+$ west espressif monitor
+```

boards/esp32.overlay

@@ -0,0 +1,3 @@
+&timer0 {
+    status = "okay";
+};

prj.conf

@@ -1,8 +1,3 @@
-# Important for LVGL to work.
-CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_LV_MEM_CUSTOM=y
-CONFIG_LV_Z_MEM_POOL_SIZE=16384
-
 # Display Configurations
 CONFIG_DISPLAY=y
 CONFIG_DISPLAY_LOG_LEVEL_ERR=y
@@ -20,25 +15,25 @@ CONFIG_LV_USE_LOG=n
 CONFIG_LVGL=y
 CONFIG_LV_FONT_MONTSERRAT_46=y
 CONFIG_LV_FONT_MONTSERRAT_18=y
+# Important for LVGL to work.
+CONFIG_MAIN_STACK_SIZE=4096
+# CONFIG_LV_MEM_CUSTOM=y
+CONFIG_LV_Z_MEM_POOL_SIZE=16384
 
 # PWM Configurations
 CONFIG_PWM=y
 
+# Bluetooth Settings
 # Bluetooth Configurations
 CONFIG_BT=y
 CONFIG_BT_PERIPHERAL=y
-CONFIG_BT_SETTINGS=y
 CONFIG_BT_DEVICE_NAME="ZephyrWatch"
-CONFIG_BT_SMP=y
-CONFIG_BT_SIGNING=y
-CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
-CONFIG_BT_PRIVACY=y
 
 # Bluetooth GATT Device Information Service Configuration
 CONFIG_BT_DIS=y
 CONFIG_BT_DIS_PNP=n
 CONFIG_BT_DIS_MODEL="ZephyrWatch_001"
-CONFIG_BT_DIS_MANUF="github.com/electricalgorithm"
+CONFIG_BT_DIS_MANUF="electricalgorithm"
 CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
@@ -50,10 +45,28 @@ CONFIG_BT_DIS_SW_REV_STR="0.0.1"
 CONFIG_BT_DIS_SETTINGS=y
 CONFIG_BT_DIS_STR_MAX=21
 
+# If not set BT_SMP &  BT_SIGNING, the device will not be able to pair with other devices.
+CONFIG_BT_SMP=y
+CONFIG_BT_SIGNING=y
+CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
+CONFIG_BT_PRIVACY=y
+
+# Settings Subsystem
+CONFIG_SETTINGS=y
+CONFIG_BT_SETTINGS=y
+
+# System Work Queue Configuration - Increased for input event handling
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=32768
+CONFIG_SYSTEM_WORKQUEUE_PRIORITY=-1
+
+# Input Subsystem Configuration - Disable input warnings
+CONFIG_INPUT=y
+CONFIG_INPUT_LOG_LEVEL_OFF=y
+
 # Flash Configurations
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 
-# RTC
-CONFIG_RTC=y
+# Counter (using correct config name)
+CONFIG_COUNTER=y

src/bluetooth/bluetooth_infra.h

@@ -2,10 +2,8 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/logging/log.h>
 
-
 LOG_MODULE_REGISTER(ZephyrWatch_BluetoothInfra, LOG_LEVEL_INF);
 
-
 static const struct bt_data m_ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_CTS_VAL)),
@@ -36,7 +34,7 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 /* The API function to enable Bluetooth and start advertisement. */
 uint8_t enable_bluetooth_and_start_advertisement() {
 	int err;
-
+	
     err = bt_enable(NULL);
 	if (err) {
 		LOG_ERR("Bluetooth init failed (err %d).", err);

src/bluetooth/current_time_service.c

@@ -0,0 +1,19 @@
+#ifndef BLUETOOTH_INFRASTRUCTURE_H_
+#define BLUETOOTH_INFRASTRUCTURE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <zephyr/settings/settings.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/logging/log.h>
+
+uint8_t enable_bluetooth_and_start_advertisement();
+uint8_t disable_bluetooth_and_stop_advertisement();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BLUETOOTH_INFRASTRUCTURE_H_ */

src/bluetooth/current_time_service.h

@@ -0,0 +1,66 @@
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <string.h>
+
+#include "current_time_service.h"
+#include "timeutils/timeutils.h"
+#include "devicetwin/devicetwin.h"
+
+LOG_MODULE_REGISTER(ZephyrWatch_CurrentTimeService, LOG_LEVEL_INF);
+
+/* Current Time Service Write Callback */
+static ssize_t m_time_write_callback(
+	struct bt_conn *conn,
+	const struct bt_gatt_attr *attr,
+	const void *buf,
+	uint16_t len,
+	uint16_t offset,
+	uint8_t flags) {
+
+	// Check if we received exactly 4 bytes for UNIX timestamp
+	if (len != 4 || offset != 0) {
+		LOG_ERR("Invalid write length or offset. Expected 4 bytes at offset 0, got %d bytes at offset %d", len, offset);
+		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
+	}
+
+	// Extract the UNIX timestamp from the buffer (assuming little-endian)
+	uint32_t unix_timestamp = sys_le32_to_cpu(*(uint32_t *)buf);
+	LOG_INF("Received UNIX timestamp: %u", unix_timestamp);
+
+	// Get the device twin instance to get the UTC zone
+	device_twin_t *device_twin = get_device_twin_instance();
+	if (device_twin == NULL) {
+		LOG_ERR("Failed to get device twin instance.");
+		return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
+	}
+
+	// Convert UNIX timestamp to local time using the device's UTC zone
+	utc_time_t local_time = unix_to_localtime(unix_timestamp, device_twin->utc_zone);
+
+	// Update the device twin's current time with local time
+	device_twin->current_time = local_time;
+	
+	// Update the global unix time used by the UI system
+	update_global_unix_time(unix_timestamp);
+
+	LOG_INF("Current time updated to local time: %04d-%02d-%02d %02d:%02d:%02d (UTC%+d)", 
+		local_time.year, local_time.month, local_time.day,
+		local_time.hour, local_time.minute, local_time.second,
+		device_twin->utc_zone);
+
+	return len;
+}
+
+/* Dummy data for GATT characteristic - not used for actual data storage */
+static uint8_t dummy_data[4] = {0};
+
+/* Current Time Service Declaration */
+BT_GATT_SERVICE_DEFINE(cts_cvs,
+	BT_GATT_PRIMARY_SERVICE(BT_UUID_CTS),
+	BT_GATT_CHARACTERISTIC(
+		BT_UUID_CTS_CURRENT_TIME,
+		BT_GATT_CHRC_WRITE,
+		BT_GATT_PERM_WRITE,
+		NULL, m_time_write_callback, dummy_data),
+);