From 509d2204cde2b67fe7981e712205ed26800b1dd7 Mon Sep 17 00:00:00 2001 From: Joe Kearney Date: Sat, 1 Mar 2025 16:58:57 -0600 Subject: [PATCH] Changes after testing. --- 2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c | 2 +- 2020TPCApp1.cydsn/NVM/NVM_Settings.c | 10 +++++++++- 2020TPCApp1.cydsn/SystemK | 2 +- 2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c | 2 +- 2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c | 10 +++++++++- 2020TPCAppNoDFU.cydsn/SystemK | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c b/2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c index 0636c1d..5f9a494 100644 --- a/2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c +++ b/2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c @@ -241,7 +241,7 @@ void COMM_BLE_Task(void * pvParameters) } break; - case COMM_BLE_SCANNING_AND_ADVERTISING: + case COMM_BLE_SCANNING_AND_ADVERTISING: { TRACE_BLE_STATE_ENTRY("COMM_BLE_SCANNING_AND_ADVERTISING"); diff --git a/2020TPCApp1.cydsn/NVM/NVM_Settings.c b/2020TPCApp1.cydsn/NVM/NVM_Settings.c index f7959aa..964db30 100644 --- a/2020TPCApp1.cydsn/NVM/NVM_Settings.c +++ b/2020TPCApp1.cydsn/NVM/NVM_Settings.c @@ -97,6 +97,10 @@ SystemKResult_T SETTINGS_get_uint32_t(SystemKSettingID_T id, uint32_t * value) switch (id) { + case SYSTEMK_SETTING_DEVICE_TYPE: + *value = 1; // 2020TPC + break; + case SYSTEMK_SETTING_T_START_GAME_in_ms: *value = NVM_T_START_GAME_IN_MS; break; @@ -123,6 +127,10 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value) switch (id) { + case SYSTEMK_SETTING_DEVICE_TYPE: + result = SYSTEMK_RESULT_NOT_IMPLEMENTED; + break; + case SYSTEMK_SETTING_T_START_GAME_in_ms: NVM_T_START_GAME_IN_MS = value; break; @@ -147,7 +155,7 @@ SystemKResult_T SETTINGS_get_device_name(char* name) { static char device_name[] = "Another 2020TPC"; - name = device_name; + strncpy(name, device_name, sizeof(device_name)); return SYSTEMK_RESULT_SUCCESS; } diff --git a/2020TPCApp1.cydsn/SystemK b/2020TPCApp1.cydsn/SystemK index 47822bb..cd33c35 160000 --- a/2020TPCApp1.cydsn/SystemK +++ b/2020TPCApp1.cydsn/SystemK @@ -1 +1 @@ -Subproject commit 47822bbdec20eda1a4c21871c7b4fe17c36bb731 +Subproject commit cd33c3597481af67082b7db56bdab45ebd403ef6 diff --git a/2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c b/2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c index 0636c1d..5f9a494 100644 --- a/2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c +++ b/2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c @@ -241,7 +241,7 @@ void COMM_BLE_Task(void * pvParameters) } break; - case COMM_BLE_SCANNING_AND_ADVERTISING: + case COMM_BLE_SCANNING_AND_ADVERTISING: { TRACE_BLE_STATE_ENTRY("COMM_BLE_SCANNING_AND_ADVERTISING"); diff --git a/2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c b/2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c index f7959aa..964db30 100644 --- a/2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c +++ b/2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c @@ -97,6 +97,10 @@ SystemKResult_T SETTINGS_get_uint32_t(SystemKSettingID_T id, uint32_t * value) switch (id) { + case SYSTEMK_SETTING_DEVICE_TYPE: + *value = 1; // 2020TPC + break; + case SYSTEMK_SETTING_T_START_GAME_in_ms: *value = NVM_T_START_GAME_IN_MS; break; @@ -123,6 +127,10 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value) switch (id) { + case SYSTEMK_SETTING_DEVICE_TYPE: + result = SYSTEMK_RESULT_NOT_IMPLEMENTED; + break; + case SYSTEMK_SETTING_T_START_GAME_in_ms: NVM_T_START_GAME_IN_MS = value; break; @@ -147,7 +155,7 @@ SystemKResult_T SETTINGS_get_device_name(char* name) { static char device_name[] = "Another 2020TPC"; - name = device_name; + strncpy(name, device_name, sizeof(device_name)); return SYSTEMK_RESULT_SUCCESS; } diff --git a/2020TPCAppNoDFU.cydsn/SystemK b/2020TPCAppNoDFU.cydsn/SystemK index 47822bb..cd33c35 160000 --- a/2020TPCAppNoDFU.cydsn/SystemK +++ b/2020TPCAppNoDFU.cydsn/SystemK @@ -1 +1 @@ -Subproject commit 47822bbdec20eda1a4c21871c7b4fe17c36bb731 +Subproject commit cd33c3597481af67082b7db56bdab45ebd403ef6