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 +58 -2
6 changed files with 58 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1efc32e9a1 - Show all commits

14
2020TPCApp1.cydsn/2020TPCApp1.cyprj
View file

@ -1654,6 +1654,20 @@
<build_action v="HEADER;CortexM4;CortexM4;;" /> <build_action v="HEADER;CortexM4;CortexM4;;" />
<PropertyDeltas /> <PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b> </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="BLE_Utils.c" persistent="SystemK\BLE\BLE_Utils.c">
<Hidden v="False" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="SOURCE_C;CortexM4;CortexM4;;" />
<PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="BLE_Utils.h" persistent="SystemK\BLE\BLE_Utils.h">
<Hidden v="False" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="HEADER;CortexM4;CortexM4;;" />
<PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
</dependencies> </dependencies>
</CyGuid_0820c2e7-528d-4137-9a08-97257b946089> </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8> </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

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

@ -111,6 +111,20 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value)
return result; return result;
} }
SystemKResult_T SETTINGS_get_device_name(char* name)
{
static char device_name[] = "Another 2020TPC";
name = device_name;
return SYSTEMK_RESULT_SUCCESS;
}
SystemKResult_T SETTINGS_set_device_name(char* name)
{
return SYSTEMK_RESULT_NOT_IMPLEMENTED;
}
SystemKResult_T SETTINGS_Save(void) SystemKResult_T SETTINGS_Save(void)
{ {
#if (CONFIG__HAS_EXTERNAL_NVM) #if (CONFIG__HAS_EXTERNAL_NVM)

2
2020TPCApp1.cydsn/SystemK

@ -1 +1 @@
Subproject commit 4fe072f2d3280b19aa53e197bd22ec44b174ff88 Subproject commit 58f379dc1871b06a7cde07e5e2b77e93f5aebaeb

14
2020TPCAppNoDFU.cydsn/2020TPCAppNoDFU.cyprj
View file

@ -1839,6 +1839,20 @@
<build_action v="HEADER;CortexM4;CortexM4;;" /> <build_action v="HEADER;CortexM4;CortexM4;;" />
<PropertyDeltas /> <PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b> </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="BLE_Utils.c" persistent="SystemK\BLE\BLE_Utils.c">
<Hidden v="False" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="SOURCE_C;CortexM4;CortexM4;;" />
<PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="BLE_Utils.h" persistent="SystemK\BLE\BLE_Utils.h">
<Hidden v="False" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="HEADER;CortexM4;CortexM4;;" />
<PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
</dependencies> </dependencies>
</CyGuid_0820c2e7-528d-4137-9a08-97257b946089> </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8> </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

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

@ -111,6 +111,20 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value)
return result; return result;
} }
SystemKResult_T SETTINGS_get_device_name(char* name)
{
static char device_name[] = "Another 2020TPC";
name = device_name;
return SYSTEMK_RESULT_SUCCESS;
}
SystemKResult_T SETTINGS_set_device_name(char* name)
{
return SYSTEMK_RESULT_NOT_IMPLEMENTED;
}
SystemKResult_T SETTINGS_Save(void) SystemKResult_T SETTINGS_Save(void)
{ {
#if (CONFIG__HAS_EXTERNAL_NVM) #if (CONFIG__HAS_EXTERNAL_NVM)

2
2020TPCAppNoDFU.cydsn/SystemK

@ -1 +1 @@
Subproject commit 4fe072f2d3280b19aa53e197bd22ec44b174ff88 Subproject commit 58f379dc1871b06a7cde07e5e2b77e93f5aebaeb