Skip to content

Commit 20bb3d7

Browse files
artursilva0artursilva0
authored
Merge pull request #8 from harp-tech/update_fw_correct_core_start
Correct core start parameters and increase fw
2 parents b54111d + dafcc4d commit 20bb3d7

File tree

3 files changed

+97
-97
lines changed

3 files changed

+97
-97
lines changed

‎Firmware/Synchronizer/Synchronizer.cproj‎

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
<eraseonlaunchrule>0</eraseonlaunchrule>
2929
<AsfFrameworkConfig>
3030
<framework-data>
31-
<options />
32-
<configurations />
33-
<files />
34-
<documentation help="" />
35-
<offline-documentation help="" />
36-
<dependencies>
37-
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.40.0" />
38-
</dependencies>
39-
</framework-data>
31+
<options />
32+
<configurations />
33+
<files />
34+
<documentation help="" />
35+
<offline-documentation help="" />
36+
<dependencies>
37+
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.42.0" />
38+
</dependencies>
39+
</framework-data>
4040
</AsfFrameworkConfig>
4141
<avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
4242
<avrtoolinterface>PDI</avrtoolinterface>
@@ -57,94 +57,94 @@
5757
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
5858
<ToolchainSettings>
5959
<AvrGcc>
60-
<avrgcc.common.Device>-mmcu=atxmega32a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega32a4u"</avrgcc.common.Device>
61-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
62-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
63-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
64-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
65-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
66-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
67-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
68-
<avrgcc.compiler.symbols.DefSymbols>
69-
<ListValues>
70-
<Value>NDEBUG</Value>
71-
</ListValues>
72-
</avrgcc.compiler.symbols.DefSymbols>
73-
<avrgcc.compiler.directories.IncludePaths>
74-
<ListValues>
75-
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
76-
</ListValues>
77-
</avrgcc.compiler.directories.IncludePaths>
78-
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
79-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
80-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
81-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
82-
<avrgcc.linker.libraries.Libraries>
83-
<ListValues>
84-
<Value>libm</Value>
85-
</ListValues>
86-
</avrgcc.linker.libraries.Libraries>
87-
<avrgcc.linker.libraries.LibrarySearchPaths>
88-
<ListValues>
89-
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware_\Synchronizer\Synchronizer\Synchronizer</Value>
90-
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware_\Synchronizer\Synchronizer</Value>
91-
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware\Synchronizer</Value>
92-
<Value>C:\FChampalimaud\harp\device.synchronizer\Firmware\Synchronizer</Value>
93-
<Value>C:\FChampalimaud\harp\Devices\device.pump\Firmware\Pump</Value>
94-
</ListValues>
95-
</avrgcc.linker.libraries.LibrarySearchPaths>
96-
<avrgcc.assembler.general.IncludePaths>
97-
<ListValues>
98-
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
99-
</ListValues>
100-
</avrgcc.assembler.general.IncludePaths>
101-
</AvrGcc>
60+
<avrgcc.common.Device>-mmcu=atxmega32a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega32a4u"</avrgcc.common.Device>
61+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
62+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
63+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
64+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
65+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
66+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
67+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
68+
<avrgcc.compiler.symbols.DefSymbols>
69+
<ListValues>
70+
<Value>NDEBUG</Value>
71+
</ListValues>
72+
</avrgcc.compiler.symbols.DefSymbols>
73+
<avrgcc.compiler.directories.IncludePaths>
74+
<ListValues>
75+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
76+
</ListValues>
77+
</avrgcc.compiler.directories.IncludePaths>
78+
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
79+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
80+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
81+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
82+
<avrgcc.linker.libraries.Libraries>
83+
<ListValues>
84+
<Value>libm</Value>
85+
</ListValues>
86+
</avrgcc.linker.libraries.Libraries>
87+
<avrgcc.linker.libraries.LibrarySearchPaths>
88+
<ListValues>
89+
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware_\Synchronizer\Synchronizer\Synchronizer</Value>
90+
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware_\Synchronizer\Synchronizer</Value>
91+
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.Synchronizer\Firmware\Synchronizer</Value>
92+
<Value>C:\FChampalimaud\harp\device.synchronizer\Firmware\Synchronizer</Value>
93+
<Value>C:\FChampalimaud\harp\Devices\device.pump\Firmware\Pump</Value>
94+
</ListValues>
95+
</avrgcc.linker.libraries.LibrarySearchPaths>
96+
<avrgcc.assembler.general.IncludePaths>
97+
<ListValues>
98+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
99+
</ListValues>
100+
</avrgcc.assembler.general.IncludePaths>
101+
</AvrGcc>
102102
</ToolchainSettings>
103103
</PropertyGroup>
104104
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
105105
<ToolchainSettings>
106106
<AvrGcc>
107-
<avrgcc.common.Device>-mmcu=atxmega32a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega32a4u"</avrgcc.common.Device>
108-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
109-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
110-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
111-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
112-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
113-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
114-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
115-
<avrgcc.compiler.symbols.DefSymbols>
116-
<ListValues>
117-
<Value>DEBUG</Value>
118-
</ListValues>
119-
</avrgcc.compiler.symbols.DefSymbols>
120-
<avrgcc.compiler.directories.IncludePaths>
121-
<ListValues>
122-
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
123-
</ListValues>
124-
</avrgcc.compiler.directories.IncludePaths>
125-
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
126-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
127-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
128-
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
129-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
130-
<avrgcc.linker.libraries.Libraries>
131-
<ListValues>
132-
<Value>libm</Value>
133-
<Value>libATxmega32A4U-1.13.a</Value>
134-
</ListValues>
135-
</avrgcc.linker.libraries.Libraries>
136-
<avrgcc.linker.libraries.LibrarySearchPaths>
137-
<ListValues>
138-
<Value>..</Value>
139-
</ListValues>
140-
</avrgcc.linker.libraries.LibrarySearchPaths>
141-
<avrgcc.assembler.general.IncludePaths>
142-
<ListValues>
143-
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
144-
</ListValues>
145-
</avrgcc.assembler.general.IncludePaths>
146-
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
147-
</AvrGcc>
107+
<avrgcc.common.Device>-mmcu=atxmega32a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\gcc\dev\atxmega32a4u"</avrgcc.common.Device>
108+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
109+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
110+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
111+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
112+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
113+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
114+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
115+
<avrgcc.compiler.symbols.DefSymbols>
116+
<ListValues>
117+
<Value>DEBUG</Value>
118+
</ListValues>
119+
</avrgcc.compiler.symbols.DefSymbols>
120+
<avrgcc.compiler.directories.IncludePaths>
121+
<ListValues>
122+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
123+
</ListValues>
124+
</avrgcc.compiler.directories.IncludePaths>
125+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
126+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
127+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
128+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
129+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
130+
<avrgcc.linker.libraries.Libraries>
131+
<ListValues>
132+
<Value>libm</Value>
133+
<Value>libATxmega32A4U-1.13.a</Value>
134+
</ListValues>
135+
</avrgcc.linker.libraries.Libraries>
136+
<avrgcc.linker.libraries.LibrarySearchPaths>
137+
<ListValues>
138+
<Value>..</Value>
139+
</ListValues>
140+
</avrgcc.linker.libraries.LibrarySearchPaths>
141+
<avrgcc.assembler.general.IncludePaths>
142+
<ListValues>
143+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.1.68\include</Value>
144+
</ListValues>
145+
</avrgcc.assembler.general.IncludePaths>
146+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
147+
</AvrGcc>
148148
</ToolchainSettings>
149149
</PropertyGroup>
150150
<ItemGroup>

‎Firmware/Synchronizer/app.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void hwbp_app_initialize(void)
2828
uint8_t hwH = 1;
2929
uint8_t hwL;
3030
uint8_t fwH = 1;
31-
uint8_t fwL = 6;
31+
uint8_t fwL = 7;
3232
uint8_t ass = 0;
3333

3434
io_pin2in(&PORTB, 3, PULL_IO_UP, SENSE_IO_EDGES_BOTH);
@@ -52,9 +52,9 @@ void hwbp_app_initialize(void)
5252
APP_NBYTES_OF_REG_BANK,
5353
APP_REGS_ADD_MAX - APP_REGS_ADD_MIN + 1,
5454
default_device_name,
55-
true, // The device is _not_ able to repeat the harp timestamp clock
56-
true, // The device is _not_ able to generate the harp timestamp clock
57-
3 // Default timestamp offset
55+
false, // The device is _not_ able to repeat the harp timestamp clock
56+
false, // The device is _not_ able to generate the harp timestamp clock
57+
0 // Default timestamp offset
5858
);
5959
}
6060

‎device.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# yaml-language-server: $schema=https://raw.githubusercontent.com/harp-tech/reflex-generator/main/schema/device.json
44
device: Synchronizer
55
whoAmI: 1104
6-
firmwareVersion: "1.6"
6+
firmwareVersion: "1.7"
77
hardwareTargets: "1.0"
88
registers:
99
DigitalInputState:

0 commit comments

Comments
 (0)