Skip to content

Commit f36be98

Browse files
author
Peter Wegmann
committed
moved config to config.h file
1 parent 84e644a commit f36be98

File tree

3 files changed

+47
-56
lines changed

3 files changed

+47
-56
lines changed

‎avr-util-library‎

‎config.h‎

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

1212

1313
// Display Version:
14-
//#define ili9341
15-
//#define old_LCD
14+
#define ili9341
15+
//#define GCM_old_disp
16+
17+
// Network Hardware
18+
#define USE_XBEE
19+
//#define USE_LAN
1620

1721

1822
#define FIRMWARE_VERSION 212 /**< @brief Software Version */
1923

2024
#define BRANCH_ID 2
2125

26+
2227
#define HZB
2328

2429

‎gascounter-module.cproj‎

Lines changed: 39 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -122,47 +122,45 @@
122122
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
123123
<ToolchainSettings>
124124
<AvrGcc>
125-
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
126-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
127-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
128-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
129-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
130-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
131-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
132-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
133-
<avrgcc.compiler.symbols.DefSymbols>
134-
<ListValues>
135-
<Value>DEBUG</Value>
136-
<Value>F_CPU=6144000</Value>
137-
<Value>GASCOUNTER_MODULE</Value>
138-
<Value>USE_XBEE</Value>
139-
<Value>GCM_old_disp</Value>
140-
</ListValues>
141-
</avrgcc.compiler.symbols.DefSymbols>
142-
<avrgcc.compiler.directories.IncludePaths>
143-
<ListValues>
144-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
145-
<Value>../avr-util-library</Value>
146-
</ListValues>
147-
</avrgcc.compiler.directories.IncludePaths>
148-
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
149-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
150-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
151-
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
152-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
153-
<avrgcc.linker.libraries.Libraries>
154-
<ListValues>
155-
<Value>libm</Value>
156-
</ListValues>
157-
</avrgcc.linker.libraries.Libraries>
158-
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
159-
<avrgcc.assembler.general.IncludePaths>
160-
<ListValues>
161-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
162-
</ListValues>
163-
</avrgcc.assembler.general.IncludePaths>
164-
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
165-
</AvrGcc>
125+
<avrgcc.common.Device>-mmcu=atmega1284p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\gcc\dev\atmega1284p"</avrgcc.common.Device>
126+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
127+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
128+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
129+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
130+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
131+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
132+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
133+
<avrgcc.compiler.symbols.DefSymbols>
134+
<ListValues>
135+
<Value>DEBUG</Value>
136+
<Value>F_CPU=6144000</Value>
137+
<Value>GASCOUNTER_MODULE</Value>
138+
</ListValues>
139+
</avrgcc.compiler.symbols.DefSymbols>
140+
<avrgcc.compiler.directories.IncludePaths>
141+
<ListValues>
142+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
143+
<Value>../avr-util-library</Value>
144+
</ListValues>
145+
</avrgcc.compiler.directories.IncludePaths>
146+
<avrgcc.compiler.optimization.level>Optimize most (-O3)</avrgcc.compiler.optimization.level>
147+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
148+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
149+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
150+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
151+
<avrgcc.linker.libraries.Libraries>
152+
<ListValues>
153+
<Value>libm</Value>
154+
</ListValues>
155+
</avrgcc.linker.libraries.Libraries>
156+
<avrgcc.assembler.general.AssemblerFlags>-DGASCOUNTER_MODULE</avrgcc.assembler.general.AssemblerFlags>
157+
<avrgcc.assembler.general.IncludePaths>
158+
<ListValues>
159+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.132\include</Value>
160+
</ListValues>
161+
</avrgcc.assembler.general.IncludePaths>
162+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
163+
</AvrGcc>
166164
</ToolchainSettings>
167165
<OutputFileName>Gaszaehler_New</OutputFileName>
168166
<OutputFileExtension>.elf</OutputFileExtension>
@@ -180,33 +178,21 @@
180178
<Compile Include="avr-util-library\adwandler.h">
181179
<SubType>compile</SubType>
182180
</Compile>
183-
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_consolas-30x40.c">
184-
<SubType>compile</SubType>
185-
</Compile>
186181
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_f-5x8.c">
187182
<SubType>compile</SubType>
188183
</Compile>
189184
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_f-8x14.c">
190185
<SubType>compile</SubType>
191186
</Compile>
192-
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_inconsolata-27x40.c">
193-
<SubType>compile</SubType>
194-
</Compile>
195187
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_inconsolataf-12x24.c">
196188
<SubType>compile</SubType>
197189
</Compile>
198190
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_inconsolataf-8x16.c">
199191
<SubType>compile</SubType>
200192
</Compile>
201-
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_Lucida_Console-27x40.c">
202-
<SubType>compile</SubType>
203-
</Compile>
204193
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_Lucida_Console_AlpaNum-29x40.c">
205194
<SubType>compile</SubType>
206195
</Compile>
207-
<Compile Include="avr-util-library\Bitmaps_and_fonts\font_source_code_pro-31x40.c">
208-
<SubType>compile</SubType>
209-
</Compile>
210196
<Compile Include="avr-util-library\Bitmaps_and_fonts\HZB_logo_DISP_3000.c">
211197
<SubType>compile</SubType>
212198
</Compile>

0 commit comments

Comments
 (0)