Skip to content

Commit 2007ff7

Browse files
davidgivendavidgiven
committed
Fix merge wibble.
2 parents deaab94 + 6469458 commit 2007ff7

File tree

5 files changed

+82
-4
lines changed

5 files changed

+82
-4
lines changed

‎FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
:4004800088FE84F86800FFF735FF012384F85B30FFF768FFFFF77DFE84F86900FFF72AFF844B94F86800844994F869202546002A14BF0A461A46002808BF19467F48FFF7E3
2020
:4004C000E2FE0321084602F0F5F8264602F012F994F8583043B12A6EEB689B1A41F28832934201D9FFF706FF00F024FF18B97448FFF7C9FE04E000F023FF0028F7D10BE0F5
2121
:4005000000F018FF10B902F0F5F8F9E76D48FFF7BAFE032001F03EF8032000F01DFF0128D4D16948FFF7F8FE68490320FFF73FFE94F86A106648FFF7A6FE94F86A30023B2D
22-
:40054000142B00F2A783DFE813F01500A5031E00A5032400A5034600A5036C00A503CF00A503AA01A503DE02A503FD02A5030403A5031E0303238DF820308DF821300C233C
22+
:40054000142B00F2A783DFE813F01500A5031E00A5032400A5034600A5036C00A503CF00A503AA01A503DE02A503FD02A5030403A5031E0303238DF820308DF821300D233B
2323
:400580008DF82230FBE294F86C00FFF709FF514BF2E2FFF7E7FE00236372E068627A02F0FF0132B9EB681B1AB3F57A7FF6DD0B4608E03BB100227272F168627A12B9EB68D3
2424
:4005C0005B1AFAE707228DF8202004228DF82120ADF82230D3E20220FFF796FD4FF000080DF1200A02F086F84FF480790027C9EB0803DA1907F80A200137402FF9D10220C4
2525
:40060000FFF782FD3A465146022000F0FDFEB9F10109EBD108F10108B8F1400FE2D12E4B38E04FF0010A4FF000080DF1200B02F061F84FF0000959460120FFF7B8FD08EBC8
@@ -4615,12 +4615,12 @@
46154615
:0200000490105A
46164616
:04000000BC90ACAF55
46174617
:0200000490303A
4618-
:02000000B5F158
4618+
:02000000B5F257
46194619
:0200000490402A
46204620
:4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C0
46214621
:400040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
46224622
:400080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040
46234623
:4000C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
46244624
:0200000490501A
4625-
:0C00000000012E16106900002E2FC65AB9
4625+
:0C00000000012E16106900002E2FC65BB8
46264626
:00000001FF

‎FluxEngine.cydsn/FluxEngine.cydwr‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@
848848
<Data key="efd5f185-0c32-4824-ba72-3ceb5356f5a7" value="Clock_1" />
849849
</Group>
850850
<Group key="Pin">
851+
<Data key="3e1862bb-be82-47b0-9549-7ebfe76b6f7b" value="Pin_2" />
851852
<Data key="4a398466-709f-4228-9500-96178658e13e" value="RDATA" />
852853
<Data key="5a3407c1-b434-4438-a7b4-b9dfd2280495" value="MOTEA" />
853854
<Data key="8d318d8b-cf7b-4b6b-b02c-ab1c5c49d0ba" value="SW1" />
@@ -858,6 +859,7 @@
858859
<Data key="472f8fdb-f772-44fb-8897-cc690694237b" value="WDATA" />
859860
<Data key="736cb12b-c863-43d4-a8f0-42f06023f8b5" value="SIDE1" />
860861
<Data key="4249c923-fcff-453b-8629-bec6fddd00c1" value="STEP" />
862+
<Data key="27315b0e-6a8c-4b7f-be77-73ab434fa803" value="Pin_1" />
861863
<Data key="1425177d-0d0e-4468-8bcc-e638e5509a9b" value="UartRx" />
862864
<Data key="a5d987c6-e45b-45b9-ad93-656fab06d720" value="TRK00" />
863865
<Data key="a93ef5b3-00f4-42c0-8fad-0e275a7e2537" value="MOTEB" />
@@ -3963,6 +3965,11 @@
39633965
</Group>
39643966
</Group>
39653967
<Group key="Pin2">
3968+
<Group key="3e1862bb-be82-47b0-9549-7ebfe76b6f7b">
3969+
<Group key="0">
3970+
<Data key="Port Format" value="0,6" />
3971+
</Group>
3972+
</Group>
39663973
<Group key="4a398466-709f-4228-9500-96178658e13e">
39673974
<Group key="0">
39683975
<Data key="Port Format" value="1,5" />
@@ -4064,6 +4071,11 @@
40644071
<Data key="Port Format" value="1,0" />
40654072
</Group>
40664073
</Group>
4074+
<Group key="27315b0e-6a8c-4b7f-be77-73ab434fa803">
4075+
<Group key="0">
4076+
<Data key="Port Format" value="0,7" />
4077+
</Group>
4078+
</Group>
40674079
<Group key="1425177d-0d0e-4468-8bcc-e638e5509a9b">
40684080
<Group key="0">
40694081
<Data key="Port Format" value="12,6" />

‎FluxEngine.cydsn/FluxEngine.cyprj‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2781,6 +2781,72 @@
27812781
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
27822782
<filters />
27832783
</CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
2784+
<CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFolderSerialize" version="3">
2785+
<CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtBaseContainerSerialize" version="1">
2786+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_2" persistent="">
2787+
<Hidden v="True" />
2788+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2789+
<CyGuid_0820c2e7-528d-4137-9a08-97257b946089 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemListSerialize" version="2">
2790+
<dependencies>
2791+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2792+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_2_aliases.h" persistent="Generated_Source\PSoC5\Pin_2_aliases.h">
2793+
<Hidden v="True" />
2794+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2795+
<build_action v="HEADER;;;;" />
2796+
<PropertyDeltas />
2797+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2798+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2799+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_2.c" persistent="Generated_Source\PSoC5\Pin_2.c">
2800+
<Hidden v="True" />
2801+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2802+
<build_action v="SOURCE_C;CortexM3;;;" />
2803+
<PropertyDeltas />
2804+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2805+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2806+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_2.h" persistent="Generated_Source\PSoC5\Pin_2.h">
2807+
<Hidden v="True" />
2808+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2809+
<build_action v="HEADER;;;;" />
2810+
<PropertyDeltas />
2811+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2812+
</dependencies>
2813+
</CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
2814+
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
2815+
<filters />
2816+
</CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
2817+
<CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFolderSerialize" version="3">
2818+
<CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtBaseContainerSerialize" version="1">
2819+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_1" persistent="">
2820+
<Hidden v="True" />
2821+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2822+
<CyGuid_0820c2e7-528d-4137-9a08-97257b946089 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemListSerialize" version="2">
2823+
<dependencies>
2824+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2825+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_1_aliases.h" persistent="Generated_Source\PSoC5\Pin_1_aliases.h">
2826+
<Hidden v="True" />
2827+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2828+
<build_action v="HEADER;;;;" />
2829+
<PropertyDeltas />
2830+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2831+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2832+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_1.c" persistent="Generated_Source\PSoC5\Pin_1.c">
2833+
<Hidden v="True" />
2834+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2835+
<build_action v="SOURCE_C;CortexM3;;;" />
2836+
<PropertyDeltas />
2837+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2838+
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
2839+
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="Pin_1.h" persistent="Generated_Source\PSoC5\Pin_1.h">
2840+
<Hidden v="True" />
2841+
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
2842+
<build_action v="HEADER;;;;" />
2843+
<PropertyDeltas />
2844+
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
2845+
</dependencies>
2846+
</CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
2847+
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
2848+
<filters />
2849+
</CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
27842850
</dependencies>
27852851
</CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
27862852
</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

‎FluxEngine.cydsn/TopDesign/TopDesign.cysch‎

0 Bytes
Binary file not shown.

‎protocol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
enum
55
{
6-
FLUXENGINE_VERSION = 12,
6+
FLUXENGINE_VERSION = 13,
77

88
FLUXENGINE_VID = 0x1209,
99
FLUXENGINE_PID = 0x6e00,

0 commit comments

Comments
 (0)