Software/2020TPC-SW
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pulled in the latest SystemK (with new BLE). #1

Merged
Joe merged 7 commits from New_BLE into main 2025-06-08 22:21:17 +00:00
Conversation 0 Commits 7 Files changed 18 +20 -4
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5e18b21943 - Show all commits

2
2020TPCApp1.cydsn/COMM/BLE/COMM_BLE.c
View file

@ -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");

10
2020TPCApp1.cydsn/NVM/NVM_Settings.c
View file

@ -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;
}

2
2020TPCAppNoDFU.cydsn/COMM/BLE/COMM_BLE.c
View file

@ -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");

10
2020TPCAppNoDFU.cydsn/NVM/NVM_Settings.c
View file

@ -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;
}