Skip to content

Commit fa536b7

Browse files
author
Peter Wegmann
committed
added build configurations for different hardware versions
1 parent f36be98 commit fa536b7

File tree

8 files changed

+176
-47
lines changed

8 files changed

+176
-47
lines changed

‎.gitignore‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
1-
Debug/
2-
.vs/
1+
.vs/*
2+
3+
4+
*.d
5+
*.o
6+
*.eep
7+
*.hex
8+
*.lss
9+
*.map
10+
*.srec
11+
*.mk
12+
Makefile

‎GCM_old_disp-LAN/gascounter-module-LAN-GCM_old_disp.elf‎

246 KB
Binary file not shown.

‎GCM_old_disp-XBEE/gascounter-module-XBEE-GCM_old_disp.elf‎

279 KB
Binary file not shown.

‎config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212

1313
// Display Version:
14-
#define ili9341
14+
//#define ili9341
1515
//#define GCM_old_disp
1616

1717
// Network Hardware
18-
#define USE_XBEE
18+
//#define USE_XBEE
1919
//#define USE_LAN
2020

2121

‎gascounter-module.atsln‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "gascounter-module", "gascou
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|AVR = Debug|AVR
11-
Release|AVR = Release|AVR
10+
GCM_old_disp-LAN|AVR = GCM_old_disp-LAN|AVR
11+
GCM_old_disp-XBEE|AVR = GCM_old_disp-XBEE|AVR
12+
ili9341-LAN|AVR = ili9341-LAN|AVR
13+
ili9341-XBEE|AVR = ili9341-XBEE|AVR
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{DF641820-A92A-4D18-A035-FC7916312ED4}.Debug|AVR.ActiveCfg = Debug|AVR
15-
{DF641820-A92A-4D18-A035-FC7916312ED4}.Debug|AVR.Build.0 = Debug|AVR
16-
{DF641820-A92A-4D18-A035-FC7916312ED4}.Release|AVR.ActiveCfg = Release|AVR
17-
{DF641820-A92A-4D18-A035-FC7916312ED4}.Release|AVR.Build.0 = Release|AVR
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
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

‎gascounter-module.cproj‎

Lines changed: 150 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
</framework-data>
3939
</AsfFrameworkConfig>
4040
<avrtool>com.atmel.avrdbg.tool.powerdebugger</avrtool>
41-
<avrtoolinterface>ISP</avrtoolinterface>
41+
<avrtoolinterface>
42+
</avrtoolinterface>
4243
<com_atmel_avrdbg_tool_ispmk2>
4344
<ToolType>com.atmel.avrdbg.tool.ispmk2</ToolType>
4445
<ToolName>AVRISP mkII</ToolName>
@@ -81,45 +82,154 @@
8182
<ResetRule>0</ResetRule>
8283
<EraseKey />
8384
</PropertyGroup>
84-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
85+
<PropertyGroup Condition=" '$(Configuration)' == 'ili9341-XBEE' ">
8586
<ToolchainSettings>
8687
<AvrGcc>
87-
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
88-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
89-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
90-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
91-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
92-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
93-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
94-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
95-
<avrgcc.compiler.symbols.DefSymbols>
96-
<ListValues>
97-
<Value>NDEBUG</Value>
98-
</ListValues>
99-
</avrgcc.compiler.symbols.DefSymbols>
100-
<avrgcc.compiler.directories.IncludePaths>
101-
<ListValues>
102-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
103-
</ListValues>
104-
</avrgcc.compiler.directories.IncludePaths>
105-
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
106-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
107-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
108-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
109-
<avrgcc.linker.libraries.Libraries>
110-
<ListValues>
111-
<Value>libm</Value>
112-
</ListValues>
113-
</avrgcc.linker.libraries.Libraries>
114-
<avrgcc.assembler.general.IncludePaths>
115-
<ListValues>
116-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
117-
</ListValues>
118-
</avrgcc.assembler.general.IncludePaths>
119-
</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' ">
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' ">
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>
120227
</ToolchainSettings>
228+
<OutputFileName>gascounter-module-XBEE-GCM_old_disp</OutputFileName>
229+
<OutputFileExtension>.elf</OutputFileExtension>
230+
<OutputPath>bin\GCM_old_disp-XBEE\</OutputPath>
121231
</PropertyGroup>
122-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
232+
<PropertyGroup Condition=" '$(Configuration)' == 'GCM_old_disp-LAN' ">
123233
<ToolchainSettings>
124234
<AvrGcc>
125235
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
@@ -135,6 +245,8 @@
135245
<Value>DEBUG</Value>
136246
<Value>F_CPU=6144000</Value>
137247
<Value>GASCOUNTER_MODULE</Value>
248+
<Value>GCM_old_disp</Value>
249+
<Value>USE_LAN</Value>
138250
</ListValues>
139251
</avrgcc.compiler.symbols.DefSymbols>
140252
<avrgcc.compiler.directories.IncludePaths>
@@ -162,8 +274,9 @@
162274
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
163275
</AvrGcc>
164276
</ToolchainSettings>
165-
<OutputFileName>Gaszaehler_New</OutputFileName>
277+
<OutputFileName>gascounter-module-LAN-GCM_old_disp</OutputFileName>
166278
<OutputFileExtension>.elf</OutputFileExtension>
279+
<OutputPath>bin\GCM_old_disp-LAN\</OutputPath>
167280
</PropertyGroup>
168281
<ItemGroup>
169282
<Compile Include="assert.c">

‎ili9341-LAN/gascounter-module-LAN-ili9341.elf‎

261 KB
Binary file not shown.

‎ili9341-XBEE/gascounter-module-XBEE-ili9341.elf‎

293 KB
Binary file not shown.

0 commit comments

Comments
 (0)