Skip to content

Commit 76a3107

Browse files
author
Peter Wegmann
committed
added gitignore and fixed missing file issue
1 parent 4e254ad commit 76a3107

File tree

5 files changed

+98
-44
lines changed

5 files changed

+98
-44
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Debug/
2+
.vs/

‎DispAdapter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#ifdef GCM_old_disp
2727

2828
#include "disp/gcm_old_lcd_driver.h"
29-
#include "StringPixelCoordTabble_old.h"
29+
#include "StringPixelCoordTable_old.h"
3030
#endif
3131

3232
#ifdef ili9341

‎Gascounter_main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#ifdef GCM_old_disp
4747
#include "disp/gcm_old_lcd_driver.h"
48-
#include "StringPixelCoordTabble_old.h"
48+
#include "StringPixelCoordTable_old.h"
4949
#endif
5050

5151
#ifdef ili9341

‎StringPixelCoordTable_old.h‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* StringPixelCoordTabble_old.h
3+
*
4+
* Created: 24.06.2022 19:35:49
5+
* Author: qfj
6+
*/
7+
8+
9+
#ifndef STRINGPIXELCOORDTABBLE_OLD_H_
10+
#define STRINGPIXELCOORDTABBLE_OLD_H_
11+
12+
13+
14+
// INIT STRINGS
15+
#define STR_HZB_GASCOUNTER "HZB Gascount"
16+
#define STR_LAN_VARIANT "LAN-VARIANT"
17+
#define STR_XBEE_VARIANT "XBEE-VARIANT"
18+
#define STR_INIT_START "Init start"
19+
#define STR_INIT_PORTS "Init ports"
20+
#define STR_INIT_TIMER "Init timer"
21+
#define STR_INIT_INTERRUPTS "Init interr."
22+
#define STR_INIT_USART "Init usart"
23+
#define STR_INIT_I2C "Init I2C"
24+
#define STR_INIT_CLOCK "Init Clock"
25+
#define STR_INIT_CLOCK_SUCC "...success"
26+
#define STR_INIT_CLOCK_ERR "...error"
27+
#define STR_INIT_PRESS "Init Press"
28+
#define STR_INIT_PRESS_SUCC "...success"
29+
#define STR_INIT_PRESS_ERR "...error"
30+
#define STR_INIT_DONE "Init done"
31+
32+
// ERROR STRINGS
33+
#define STR_INIT_OFFLINE "Netw. Err"
34+
#define STR_INIT_OFFLINE_MESSAGE "Network connection error\n%s"
35+
#define STR_NO_COORDINATOR_FOUND "No Coord."
36+
#define STR_NO_SERVER_FOUND "No Server"
37+
38+
#define STR_OPTIONS_LENGTH "Opt. len Err"
39+
#define STR_OPTIONS_LENGTH_MESSAGE "expected:%i\nreceived:%i"
40+
41+
#define STR_OPTION_RANGE_ERR "Bounds Err."
42+
#define STR_OPTION_RANGE_ERR_MESSAGE " "
43+
#define STR_RANGE_ERROR "%s\nr:%lu\ne:[%lu..%lu]\n"
44+
45+
#define STR_BMP_SENSOR_ERROR "BMP Error"
46+
#define STR_BMP_SENSOR_ERROR_MESSAGE "Temp. Press.Sensor not connected"
47+
48+
#define STR_RTC_ERROR "RTC ERROR"
49+
#define STR_RTC_ERROR_MESSAGE "Realtime clock not initialized"
50+
51+
52+
#endif /* STRINGPIXELCOORDTABBLE_OLD_H_ */

‎gascounter-module.cproj‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -122,47 +122,47 @@
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+
<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>
166166
</ToolchainSettings>
167167
<OutputFileName>Gaszaehler_New</OutputFileName>
168168
<OutputFileExtension>.elf</OutputFileExtension>
@@ -330,7 +330,7 @@
330330
<Compile Include="Gascounter_main.h">
331331
<SubType>compile</SubType>
332332
</Compile>
333-
<Compile Include="StringPixelCoordTabble_old.h">
333+
<Compile Include="StringPixelCoordTable_old.h">
334334
<SubType>compile</SubType>
335335
</Compile>
336336
<Compile Include="StringPixelCoordTable_ili9341.h">

0 commit comments

Comments
 (0)