Skip to content

Commit 938ba3b

Browse files
artursilva0artursilva0
authored
Merge pull request #5 from harp-tech/update_core_start_and_firmware
Update core start and firmware
2 parents 91b6d41 + 787fd3d commit 938ba3b

3 files changed

Lines changed: 50 additions & 16 deletions

File tree

‎Firmware/LoadCells/LoadCells.cppproj‎

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<SchemaVersion>2.0</SchemaVersion>
5-
<ProjectVersion>6.2</ProjectVersion>
5+
<ProjectVersion>7.0</ProjectVersion>
66
<ToolchainName>com.Atmel.AVRGCC8.CPP</ToolchainName>
77
<ProjectGuid>{2ac71c99-e332-42ac-aa16-8b5fcc4c013b}</ProjectGuid>
88
<avrdevice>ATxmega128A4U</avrdevice>
@@ -27,16 +27,16 @@
2727
<BootSegment>2</BootSegment>
2828
<eraseonlaunchrule>0</eraseonlaunchrule>
2929
<AsfFrameworkConfig>
30-
<framework-data xmlns="">
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.21.0" />
38-
</dependencies>
39-
</framework-data>
30+
<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>
@@ -51,10 +51,13 @@
5151
<ToolNumber>J41800031896</ToolNumber>
5252
<ToolName>Atmel-ICE</ToolName>
5353
</com_atmel_avrdbg_tool_atmelice>
54+
<ResetRule>0</ResetRule>
55+
<EraseKey />
5456
</PropertyGroup>
5557
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
5658
<ToolchainSettings>
5759
<AvrGccCpp>
60+
<avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
5861
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
5962
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
6063
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
@@ -68,6 +71,11 @@
6871
<Value>NDEBUG</Value>
6972
</ListValues>
7073
</avrgcc.compiler.symbols.DefSymbols>
74+
<avrgcc.compiler.directories.IncludePaths>
75+
<ListValues>
76+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
77+
</ListValues>
78+
</avrgcc.compiler.directories.IncludePaths>
7179
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
7280
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
7381
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
@@ -79,6 +87,11 @@
7987
<Value>NDEBUG</Value>
8088
</ListValues>
8189
</avrgcccpp.compiler.symbols.DefSymbols>
90+
<avrgcccpp.compiler.directories.IncludePaths>
91+
<ListValues>
92+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
93+
</ListValues>
94+
</avrgcccpp.compiler.directories.IncludePaths>
8295
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
8396
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
8497
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
@@ -93,12 +106,18 @@
93106
<Value>C:\Users\Filipe Carvalho\Documents\BitBucket\Device.LoadCells\Firmware\LoadCells</Value>
94107
</ListValues>
95108
</avrgcccpp.linker.libraries.LibrarySearchPaths>
109+
<avrgcccpp.assembler.general.IncludePaths>
110+
<ListValues>
111+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
112+
</ListValues>
113+
</avrgcccpp.assembler.general.IncludePaths>
96114
</AvrGccCpp>
97115
</ToolchainSettings>
98116
</PropertyGroup>
99117
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
100118
<ToolchainSettings>
101119
<AvrGccCpp>
120+
<avrgcc.common.Device>-mmcu=atxmega128a4u -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\gcc\dev\atxmega128a4u"</avrgcc.common.Device>
102121
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
103122
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
104123
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
@@ -112,6 +131,11 @@
112131
<Value>DEBUG</Value>
113132
</ListValues>
114133
</avrgcc.compiler.symbols.DefSymbols>
134+
<avrgcc.compiler.directories.IncludePaths>
135+
<ListValues>
136+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
137+
</ListValues>
138+
</avrgcc.compiler.directories.IncludePaths>
115139
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
116140
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
117141
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
@@ -124,6 +148,11 @@
124148
<Value>DEBUG</Value>
125149
</ListValues>
126150
</avrgcccpp.compiler.symbols.DefSymbols>
151+
<avrgcccpp.compiler.directories.IncludePaths>
152+
<ListValues>
153+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
154+
</ListValues>
155+
</avrgcccpp.compiler.directories.IncludePaths>
127156
<avrgcccpp.compiler.optimization.level>Optimize most (-O3)</avrgcccpp.compiler.optimization.level>
128157
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
129158
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
@@ -140,6 +169,11 @@
140169
<Value>..</Value>
141170
</ListValues>
142171
</avrgcccpp.linker.libraries.LibrarySearchPaths>
172+
<avrgcccpp.assembler.general.IncludePaths>
173+
<ListValues>
174+
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.2.141\include\</Value>
175+
</ListValues>
176+
</avrgcccpp.assembler.general.IncludePaths>
143177
<avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
144178
</AvrGccCpp>
145179
</ToolchainSettings>

‎Firmware/LoadCells/app.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void hwbp_app_initialize(void)
2727
uint8_t hwH = 1;
2828
uint8_t hwL = 1;
2929
uint8_t fwH = 1;
30-
uint8_t fwL = 0;
30+
uint8_t fwL = 1;
3131
uint8_t ass = 0;
3232

3333
/* Start core */
@@ -40,9 +40,9 @@ void hwbp_app_initialize(void)
4040
APP_NBYTES_OF_REG_BANK,
4141
APP_REGS_ADD_MAX - APP_REGS_ADD_MIN + 1,
4242
default_device_name,
43-
true, // The device is _not_ able to repeat the harp timestamp clock
44-
true, // The device is _not_ able to generate the harp timestamp clock
45-
3 // Default timestamp offset
43+
false, // The device is _not_ able to repeat the harp timestamp clock
44+
false, // The device is _not_ able to generate the harp timestamp clock
45+
0 // Default timestamp offset
4646
);
4747
}
4848

‎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: LoadCells
55
whoAmI: 1232
6-
firmwareVersion: "1.0"
6+
firmwareVersion: "1.1"
77
hardwareTargets: "1.0"
88
registers:
99
AcquisitionState:

0 commit comments

Comments
 (0)