Skip to content

Commit 963e160

Browse files
author
Peter Wegmann
committed
Errors are now only reported if they differ from the last time they were sent
1 parent 92ad18c commit 963e160

File tree

3 files changed

+241
-29
lines changed

3 files changed

+241
-29
lines changed

avr-util-library

gascounter-module.atsln

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,31 @@ EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
GCM_old_disp-LAN|AVR = GCM_old_disp-LAN|AVR
11+
GCM_old_disp-LAN-HZB|AVR = GCM_old_disp-LAN-HZB|AVR
1112
GCM_old_disp-XBEE|AVR = GCM_old_disp-XBEE|AVR
13+
GCM_old_disp-XBEE-HZB|AVR = GCM_old_disp-XBEE-HZB|AVR
1214
ili9341-LAN|AVR = ili9341-LAN|AVR
15+
ili9341-LAN-HZB|AVR = ili9341-LAN-HZB|AVR
1316
ili9341-XBEE|AVR = ili9341-XBEE|AVR
17+
ili9341-XBEE-HZB|AVR = ili9341-XBEE-HZB|AVR
1418
EndGlobalSection
1519
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN|AVR.ActiveCfg = GCM_old_disp-LAN|AVR
17-
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN|AVR.Build.0 = GCM_old_disp-LAN|AVR
18-
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE|AVR.ActiveCfg = GCM_old_disp-XBEE|AVR
19-
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE|AVR.Build.0 = GCM_old_disp-XBEE|AVR
20-
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN|AVR.ActiveCfg = ili9341-LAN|AVR
21-
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN|AVR.Build.0 = ili9341-LAN|AVR
22-
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE|AVR.ActiveCfg = ili9341-XBEE|AVR
23-
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE|AVR.Build.0 = ili9341-XBEE|AVR
20+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN|AVR.ActiveCfg = GCM_old_disp-LAN-HZB|AVR
21+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN|AVR.Build.0 = GCM_old_disp-LAN-HZB|AVR
22+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN-HZB|AVR.ActiveCfg = GCM_old_disp-LAN-HZB|AVR
23+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-LAN-HZB|AVR.Build.0 = GCM_old_disp-LAN-HZB|AVR
24+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE|AVR.ActiveCfg = ili9341-XBEE-DEFAULT|AVR
25+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE|AVR.Build.0 = ili9341-XBEE-DEFAULT|AVR
26+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE-HZB|AVR.ActiveCfg = GCM_old_disp-XBEE-HZB|AVR
27+
{DF641820-A92A-4D18-A035-FC7916312ED4}.GCM_old_disp-XBEE-HZB|AVR.Build.0 = GCM_old_disp-XBEE-HZB|AVR
28+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN|AVR.ActiveCfg = ili9341-LAN-HZB|AVR
29+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN|AVR.Build.0 = ili9341-LAN-HZB|AVR
30+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN-HZB|AVR.ActiveCfg = ili9341-LAN-HZB|AVR
31+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-LAN-HZB|AVR.Build.0 = ili9341-LAN-HZB|AVR
32+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE|AVR.ActiveCfg = ili9341-XBEE-HZB|AVR
33+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE|AVR.Build.0 = ili9341-XBEE-HZB|AVR
34+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE-HZB|AVR.ActiveCfg = ili9341-XBEE-HZB|AVR
35+
{DF641820-A92A-4D18-A035-FC7916312ED4}.ili9341-XBEE-HZB|AVR.Build.0 = ili9341-XBEE-HZB|AVR
2436
EndGlobalSection
2537
GlobalSection(SolutionProperties) = preSolution
2638
HideSolutionNode = FALSE

gascounter-module.cproj

Lines changed: 220 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,203 @@
8282
<ResetRule>0</ResetRule>
8383
<EraseKey />
8484
</PropertyGroup>
85-
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-XBEE' ">
85+
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-XBEE-DEFAULT' ">
86+
<ToolchainSettings>
87+
<AvrGcc>
88+
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
89+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
90+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
91+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
92+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
93+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
94+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
95+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
96+
<avrgcc.compiler.symbols.DefSymbols>
97+
<ListValues>
98+
<Value>DEBUG</Value>
99+
<Value>F_CPU=6144000</Value>
100+
<Value>GASCOUNTER_MODULE</Value>
101+
<Value>ili9341</Value>
102+
<Value>USE_XBEE</Value>
103+
</ListValues>
104+
</avrgcc.compiler.symbols.DefSymbols>
105+
<avrgcc.compiler.directories.IncludePaths>
106+
<ListValues>
107+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
108+
<Value>../avr-util-library</Value>
109+
</ListValues>
110+
</avrgcc.compiler.directories.IncludePaths>
111+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
112+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
113+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
114+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
115+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
116+
<avrgcc.linker.libraries.Libraries>
117+
<ListValues>
118+
<Value>libm</Value>
119+
</ListValues>
120+
</avrgcc.linker.libraries.Libraries>
121+
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
122+
<avrgcc.assembler.general.IncludePaths>
123+
<ListValues>
124+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
125+
</ListValues>
126+
</avrgcc.assembler.general.IncludePaths>
127+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
128+
</AvrGcc>
129+
</ToolchainSettings>
130+
<OutputFileName>gascounter-module-XBEE-ili9341</OutputFileName>
131+
<OutputFileExtension>.elf</OutputFileExtension>
132+
<OutputPath>bin\new Disp\</OutputPath>
133+
</PropertyGroup>
134+
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-LAN-DEFAULT' ">
135+
<ToolchainSettings>
136+
<AvrGcc>
137+
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
138+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
139+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
140+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
141+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
142+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
143+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
144+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
145+
<avrgcc.compiler.symbols.DefSymbols>
146+
<ListValues>
147+
<Value>DEBUG</Value>
148+
<Value>F_CPU=6144000</Value>
149+
<Value>GASCOUNTER_MODULE</Value>
150+
<Value>ili9341</Value>
151+
<Value>USE_LAN</Value>
152+
</ListValues>
153+
</avrgcc.compiler.symbols.DefSymbols>
154+
<avrgcc.compiler.directories.IncludePaths>
155+
<ListValues>
156+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
157+
<Value>../avr-util-library</Value>
158+
</ListValues>
159+
</avrgcc.compiler.directories.IncludePaths>
160+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
161+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
162+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
163+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
164+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
165+
<avrgcc.linker.libraries.Libraries>
166+
<ListValues>
167+
<Value>libm</Value>
168+
</ListValues>
169+
</avrgcc.linker.libraries.Libraries>
170+
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
171+
<avrgcc.assembler.general.IncludePaths>
172+
<ListValues>
173+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
174+
</ListValues>
175+
</avrgcc.assembler.general.IncludePaths>
176+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
177+
</AvrGcc>
178+
</ToolchainSettings>
179+
<OutputFileName>gascounter-module-LAN-ili9341</OutputFileName>
180+
<OutputFileExtension>.elf</OutputFileExtension>
181+
<OutputPath>bin\ili9341-LAN\</OutputPath>
182+
</PropertyGroup>
183+
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-XBEE-DEFAULT' ">
184+
<ToolchainSettings>
185+
<AvrGcc>
186+
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
187+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
188+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
189+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
190+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
191+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
192+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
193+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
194+
<avrgcc.compiler.symbols.DefSymbols>
195+
<ListValues>
196+
<Value>DEBUG</Value>
197+
<Value>F_CPU=6144000</Value>
198+
<Value>GASCOUNTER_MODULE</Value>
199+
<Value>GCM_old_disp</Value>
200+
<Value>USE_XBEE</Value>
201+
</ListValues>
202+
</avrgcc.compiler.symbols.DefSymbols>
203+
<avrgcc.compiler.directories.IncludePaths>
204+
<ListValues>
205+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
206+
<Value>../avr-util-library</Value>
207+
</ListValues>
208+
</avrgcc.compiler.directories.IncludePaths>
209+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
210+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
211+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
212+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
213+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
214+
<avrgcc.linker.libraries.Libraries>
215+
<ListValues>
216+
<Value>libm</Value>
217+
</ListValues>
218+
</avrgcc.linker.libraries.Libraries>
219+
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
220+
<avrgcc.assembler.general.IncludePaths>
221+
<ListValues>
222+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
223+
</ListValues>
224+
</avrgcc.assembler.general.IncludePaths>
225+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
226+
</AvrGcc>
227+
</ToolchainSettings>
228+
<OutputFileName>gascounter-module-XBEE-GCM_old_disp</OutputFileName>
229+
<OutputFileExtension>.elf</OutputFileExtension>
230+
<OutputPath>bin\GCM_old_disp-XBEE\</OutputPath>
231+
</PropertyGroup>
232+
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-LAN-DEFAULT' ">
233+
<ToolchainSettings>
234+
<AvrGcc>
235+
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
236+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
237+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
238+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
239+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
240+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
241+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
242+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
243+
<avrgcc.compiler.symbols.DefSymbols>
244+
<ListValues>
245+
<Value>DEBUG</Value>
246+
<Value>F_CPU=6144000</Value>
247+
<Value>GASCOUNTER_MODULE</Value>
248+
<Value>GCM_old_disp</Value>
249+
<Value>USE_LAN</Value>
250+
</ListValues>
251+
</avrgcc.compiler.symbols.DefSymbols>
252+
<avrgcc.compiler.directories.IncludePaths>
253+
<ListValues>
254+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
255+
<Value>../avr-util-library</Value>
256+
</ListValues>
257+
</avrgcc.compiler.directories.IncludePaths>
258+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
259+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
260+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
261+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
262+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
263+
<avrgcc.linker.libraries.Libraries>
264+
<ListValues>
265+
<Value>libm</Value>
266+
</ListValues>
267+
</avrgcc.linker.libraries.Libraries>
268+
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
269+
<avrgcc.assembler.general.IncludePaths>
270+
<ListValues>
271+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
272+
</ListValues>
273+
</avrgcc.assembler.general.IncludePaths>
274+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
275+
</AvrGcc>
276+
</ToolchainSettings>
277+
<OutputFileName>gascounter-module-LAN-GCM_old_disp</OutputFileName>
278+
<OutputFileExtension>.elf</OutputFileExtension>
279+
<OutputPath>bin\GCM_old_disp-LAN\</OutputPath>
280+
</PropertyGroup>
281+
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-LAN-HZB' ">
86282
<ToolchainSettings>
87283
<AvrGcc>
88284
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
@@ -98,8 +294,9 @@
98294
<Value>DEBUG</Value>
99295
<Value>F_CPU=6144000</Value>
100296
<Value>GASCOUNTER_MODULE</Value>
101-
<Value>ili9341</Value>
102-
<Value>USE_XBEE</Value>
297+
<Value>GCM_old_disp</Value>
298+
<Value>USE_LAN</Value>
299+
<Value>HZB_HE_NETWORK</Value>
103300
</ListValues>
104301
</avrgcc.compiler.symbols.DefSymbols>
105302
<avrgcc.compiler.directories.IncludePaths>
@@ -127,11 +324,11 @@
127324
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
128325
</AvrGcc>
129326
</ToolchainSettings>
130-
<OutputFileName>gascounter-module-XBEE-ili9341</OutputFileName>
327+
<OutputFileName>gascounter-module-LAN-GCM_old_disp</OutputFileName>
131328
<OutputFileExtension>.elf</OutputFileExtension>
132-
<OutputPath>bin\new Disp\</OutputPath>
329+
<OutputPath>bin\GCM_old_disp-LAN-HZB\</OutputPath>
133330
</PropertyGroup>
134-
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-LAN' ">
331+
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-XBEE-HZB' ">
135332
<ToolchainSettings>
136333
<AvrGcc>
137334
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
@@ -147,8 +344,9 @@
147344
<Value>DEBUG</Value>
148345
<Value>F_CPU=6144000</Value>
149346
<Value>GASCOUNTER_MODULE</Value>
150-
<Value>ili9341</Value>
151-
<Value>USE_LAN</Value>
347+
<Value>GCM_old_disp</Value>
348+
<Value>USE_XBEE</Value>
349+
<Value>HZB_HE_NETWORK</Value>
152350
</ListValues>
153351
</avrgcc.compiler.symbols.DefSymbols>
154352
<avrgcc.compiler.directories.IncludePaths>
@@ -176,11 +374,11 @@
176374
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
177375
</AvrGcc>
178376
</ToolchainSettings>
179-
<OutputFileName>gascounter-module-LAN-ili9341</OutputFileName>
377+
<OutputFileName>gascounter-module-XBEE-GCM_old_disp</OutputFileName>
180378
<OutputFileExtension>.elf</OutputFileExtension>
181-
<OutputPath>bin\ili9341-LAN\</OutputPath>
379+
<OutputPath>bin\GCM_old_disp-XBEE-HZB\</OutputPath>
182380
</PropertyGroup>
183-
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-XBEE' ">
381+
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-LAN-HZB' ">
184382
<ToolchainSettings>
185383
<AvrGcc>
186384
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
@@ -196,8 +394,9 @@
196394
<Value>DEBUG</Value>
197395
<Value>F_CPU=6144000</Value>
198396
<Value>GASCOUNTER_MODULE</Value>
199-
<Value>GCM_old_disp</Value>
200-
<Value>USE_XBEE</Value>
397+
<Value>ili9341</Value>
398+
<Value>USE_LAN</Value>
399+
<Value>HZB_HE_NETWORK</Value>
201400
</ListValues>
202401
</avrgcc.compiler.symbols.DefSymbols>
203402
<avrgcc.compiler.directories.IncludePaths>
@@ -225,11 +424,11 @@
225424
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
226425
</AvrGcc>
227426
</ToolchainSettings>
228-
<OutputFileName>gascounter-module-XBEE-GCM_old_disp</OutputFileName>
427+
<OutputFileName>gascounter-module-LAN-ili9341</OutputFileName>
229428
<OutputFileExtension>.elf</OutputFileExtension>
230-
<OutputPath>bin\GCM_old_disp-XBEE\</OutputPath>
429+
<OutputPath>bin\ili9341-LAN-HZB\</OutputPath>
231430
</PropertyGroup>
232-
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-LAN' ">
431+
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-XBEE-HZB' ">
233432
<ToolchainSettings>
234433
<AvrGcc>
235434
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
@@ -245,8 +444,9 @@
245444
<Value>DEBUG</Value>
246445
<Value>F_CPU=6144000</Value>
247446
<Value>GASCOUNTER_MODULE</Value>
248-
<Value>GCM_old_disp</Value>
249-
<Value>USE_LAN</Value>
447+
<Value>ili9341</Value>
448+
<Value>USE_XBEE</Value>
449+
<Value>HZB_HE_NETWORK</Value>
250450
</ListValues>
251451
</avrgcc.compiler.symbols.DefSymbols>
252452
<avrgcc.compiler.directories.IncludePaths>
@@ -274,9 +474,9 @@
274474
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
275475
</AvrGcc>
276476
</ToolchainSettings>
277-
<OutputFileName>gascounter-module-LAN-GCM_old_disp</OutputFileName>
477+
<OutputFileName>gascounter-module-XBEE-ili9341</OutputFileName>
278478
<OutputFileExtension>.elf</OutputFileExtension>
279-
<OutputPath>bin\GCM_old_disp-LAN\</OutputPath>
479+
<OutputPath>bin\ili9341-XBEE-HZB\</OutputPath>
280480
</PropertyGroup>
281481
<ItemGroup>
282482
<Compile Include="assert.c">

0 commit comments

Comments
 (0)