Skip to content

Commit a585c3c

Browse files
aethanielaethaniel
committed
Atmel Studio validation projects update
Signed-off-by: Thibaut VIARD <[email protected]>
1 parent 8e2a8cb commit a585c3c

File tree

3 files changed

+180
-119
lines changed

3 files changed

+180
-119
lines changed

‎cores/validation/validation_core/build_as6/test.cppproj

Lines changed: 110 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,26 @@
5858
<InterfaceName>SWD</InterfaceName>
5959
</ToolOptions>
6060
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
61-
<ToolNumber>ATML2320021800000009</ToolNumber>
61+
<ToolNumber>ATML2320021800000003</ToolNumber>
6262
<ToolName>EDBG</ToolName>
6363
</com_atmel_avrdbg_tool_edbg>
6464
</PropertyGroup>
6565
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
6666
<ToolchainSettings>
6767
<ArmGccCpp>
68-
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
68+
<armgcc.common.outputfiles.hex>False</armgcc.common.outputfiles.hex>
6969
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
70-
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
70+
<armgcc.common.outputfiles.eep>False</armgcc.common.outputfiles.eep>
7171
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
72-
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
72+
<armgcc.common.outputfiles.srec>False</armgcc.common.outputfiles.srec>
73+
<armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
7374
<armgcc.compiler.symbols.DefSymbols>
7475
<ListValues>
76+
<Value>F_CPU=48000000L</Value>
7577
<Value>NDEBUG</Value>
7678
</ListValues>
7779
</armgcc.compiler.symbols.DefSymbols>
80+
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
7881
<armgcc.compiler.directories.IncludePaths>
7982
<ListValues>
8083
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
@@ -86,14 +89,19 @@
8689
<Value>../../../../../libraries/Wire</Value>
8790
</ListValues>
8891
</armgcc.compiler.directories.IncludePaths>
89-
<armgcc.compiler.optimization.level>Optimize for size (-Os)</armgcc.compiler.optimization.level>
9092
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
93+
<armgcc.compiler.optimization.PrepareDataForGarbageCollection>True</armgcc.compiler.optimization.PrepareDataForGarbageCollection>
94+
<armgcc.compiler.optimization.EnableLongCalls>False</armgcc.compiler.optimization.EnableLongCalls>
9195
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
96+
<armgcc.compiler.miscellaneous.OtherFlags>-march=armv6-m</armgcc.compiler.miscellaneous.OtherFlags>
97+
<armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>False</armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
9298
<armgcccpp.compiler.symbols.DefSymbols>
9399
<ListValues>
100+
<Value>F_CPU=48000000L</Value>
94101
<Value>NDEBUG</Value>
95102
</ListValues>
96103
</armgcccpp.compiler.symbols.DefSymbols>
104+
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
97105
<armgcccpp.compiler.directories.IncludePaths>
98106
<ListValues>
99107
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
@@ -105,21 +113,28 @@
105113
<Value>../../../../../libraries/Wire</Value>
106114
</ListValues>
107115
</armgcccpp.compiler.directories.IncludePaths>
108-
<armgcccpp.compiler.optimization.level>Optimize for size (-Os)</armgcccpp.compiler.optimization.level>
109116
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
117+
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
118+
<armgcccpp.compiler.optimization.EnableLongCalls>False</armgcccpp.compiler.optimization.EnableLongCalls>
110119
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
120+
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=c++98 -march=armv6-m</armgcccpp.compiler.miscellaneous.OtherFlags>
121+
<armgcccpp.linker.general.UseNewlibNano>False</armgcccpp.linker.general.UseNewlibNano>
111122
<armgcccpp.linker.libraries.Libraries>
112123
<ListValues>
113124
<Value>libm</Value>
114125
</ListValues>
115126
</armgcccpp.linker.libraries.Libraries>
116127
<armgcccpp.linker.libraries.LibrarySearchPaths>
117128
<ListValues>
118-
<Value>../cmsis/linkerScripts</Value>
129+
<Value>../../../../../variants/arduino_zero/linker_scripts/gcc</Value>
119130
</ListValues>
120131
</armgcccpp.linker.libraries.LibrarySearchPaths>
121132
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
122-
<armgcccpp.linker.miscellaneous.LinkerFlags>-Tsamd21g18a_flash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
133+
<armgcccpp.linker.memorysettings.ExternalRAM>False</armgcccpp.linker.memorysettings.ExternalRAM>
134+
<armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld -march=armv6-m</armgcccpp.linker.miscellaneous.LinkerFlags>
135+
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
136+
<armgcc.compiler.optimization.level>Optimize for size (-Os)</armgcc.compiler.optimization.level>
137+
<armgcccpp.compiler.optimization.level>Optimize for size (-Os)</armgcccpp.compiler.optimization.level>
123138
<armgcccpp.preprocessingassembler.general.IncludePaths>
124139
<ListValues>
125140
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
@@ -137,89 +152,93 @@
137152
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
138153
<ToolchainSettings>
139154
<ArmGccCpp>
140-
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
141-
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
142-
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
143-
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
144-
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
145-
<armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
146-
<armgcc.compiler.symbols.DefSymbols>
147-
<ListValues>
148-
<Value>DEBUG</Value>
149-
</ListValues>
150-
</armgcc.compiler.symbols.DefSymbols>
151-
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
152-
<armgcc.compiler.directories.IncludePaths>
153-
<ListValues>
154-
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
155-
<Value>../../../../../../../tools/CMSIS/CMSIS/Include</Value>
156-
<Value>../../../../arduino</Value>
157-
<Value>../../../../arduino/USB</Value>
158-
<Value>../../../../../variants/arduino_zero</Value>
159-
<Value>../../../../../libraries/SPI</Value>
160-
<Value>../../../../../libraries/Wire</Value>
161-
</ListValues>
162-
</armgcc.compiler.directories.IncludePaths>
163-
<armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
164-
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
165-
<armgcc.compiler.optimization.PrepareDataForGarbageCollection>True</armgcc.compiler.optimization.PrepareDataForGarbageCollection>
166-
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
167-
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
168-
<armgcc.compiler.miscellaneous.OtherFlags>-std=c99</armgcc.compiler.miscellaneous.OtherFlags>
169-
<armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
170-
<armgcccpp.compiler.symbols.DefSymbols>
171-
<ListValues>
172-
<Value>DEBUG</Value>
173-
<Value>USB_VID=0x2341</Value>
174-
<Value>USB_PID=0x004d</Value>
175-
</ListValues>
176-
</armgcccpp.compiler.symbols.DefSymbols>
177-
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
178-
<armgcccpp.compiler.directories.IncludePaths>
179-
<ListValues>
180-
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
181-
<Value>../../../../../../../tools/CMSIS/CMSIS/Include</Value>
182-
<Value>../../../../arduino</Value>
183-
<Value>../../../../arduino/USB</Value>
184-
<Value>../../../../../variants/arduino_zero</Value>
185-
<Value>../../../../../libraries/SPI</Value>
186-
<Value>../../../../../libraries/Wire</Value>
187-
</ListValues>
188-
</armgcccpp.compiler.directories.IncludePaths>
189-
<armgcccpp.compiler.optimization.level>Optimize (-O1)</armgcccpp.compiler.optimization.level>
190-
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
191-
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
192-
<armgcccpp.compiler.optimization.DebugLevel>Maximum (-g3)</armgcccpp.compiler.optimization.DebugLevel>
193-
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
194-
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=c++98</armgcccpp.compiler.miscellaneous.OtherFlags>
195-
<armgcccpp.linker.general.UseNewlibNano>True</armgcccpp.linker.general.UseNewlibNano>
196-
<armgcccpp.linker.libraries.Libraries>
197-
<ListValues>
198-
<Value>libm</Value>
199-
</ListValues>
200-
</armgcccpp.linker.libraries.Libraries>
201-
<armgcccpp.linker.libraries.LibrarySearchPaths>
202-
<ListValues>
203-
<Value>../../../../../variants/arduino_zero/linker_scripts/gcc</Value>
204-
</ListValues>
205-
</armgcccpp.linker.libraries.LibrarySearchPaths>
206-
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
207-
<armgcccpp.linker.memorysettings.ExternalRAM />
208-
<armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
209-
<armgcccpp.assembler.general.IncludePaths>
210-
<ListValues>
211-
<Value>../../../arduino</Value>
212-
</ListValues>
213-
</armgcccpp.assembler.general.IncludePaths>
214-
<armgcccpp.assembler.debugging.DebugLevel>Default (-g)</armgcccpp.assembler.debugging.DebugLevel>
215-
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
216-
<armgcccpp.preprocessingassembler.general.IncludePaths>
217-
<ListValues>
218-
<Value>../../../arduino</Value>
219-
</ListValues>
220-
</armgcccpp.preprocessingassembler.general.IncludePaths>
221-
<armgcccpp.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcccpp.preprocessingassembler.debugging.DebugLevel>
222-
</ArmGccCpp>
155+
<armgcc.common.outputfiles.hex>False</armgcc.common.outputfiles.hex>
156+
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
157+
<armgcc.common.outputfiles.eep>False</armgcc.common.outputfiles.eep>
158+
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
159+
<armgcc.common.outputfiles.srec>False</armgcc.common.outputfiles.srec>
160+
<armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</armgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
161+
<armgcc.compiler.symbols.DefSymbols>
162+
<ListValues>
163+
<Value>F_CPU=48000000L</Value>
164+
<Value>DEBUG</Value>
165+
</ListValues>
166+
</armgcc.compiler.symbols.DefSymbols>
167+
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
168+
<armgcc.compiler.directories.IncludePaths>
169+
<ListValues>
170+
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
171+
<Value>../../../../../../../tools/CMSIS/CMSIS/Include</Value>
172+
<Value>../../../../arduino</Value>
173+
<Value>../../../../arduino/USB</Value>
174+
<Value>../../../../../variants/arduino_zero</Value>
175+
<Value>../../../../../libraries/SPI</Value>
176+
<Value>../../../../../libraries/Wire</Value>
177+
</ListValues>
178+
</armgcc.compiler.directories.IncludePaths>
179+
<armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
180+
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
181+
<armgcc.compiler.optimization.PrepareDataForGarbageCollection>True</armgcc.compiler.optimization.PrepareDataForGarbageCollection>
182+
<armgcc.compiler.optimization.EnableLongCalls>False</armgcc.compiler.optimization.EnableLongCalls>
183+
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
184+
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
185+
<armgcc.compiler.miscellaneous.OtherFlags>-march=armv6-m</armgcc.compiler.miscellaneous.OtherFlags>
186+
<armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</armgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
187+
<armgcccpp.compiler.symbols.DefSymbols>
188+
<ListValues>
189+
<Value>F_CPU=48000000L</Value>
190+
<Value>DEBUG</Value>
191+
<Value>USB_VID=0x2341</Value>
192+
<Value>USB_PID=0x004d</Value>
193+
</ListValues>
194+
</armgcccpp.compiler.symbols.DefSymbols>
195+
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
196+
<armgcccpp.compiler.directories.IncludePaths>
197+
<ListValues>
198+
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
199+
<Value>../../../../../../../tools/CMSIS/CMSIS/Include</Value>
200+
<Value>../../../../arduino</Value>
201+
<Value>../../../../arduino/USB</Value>
202+
<Value>../../../../../variants/arduino_zero</Value>
203+
<Value>../../../../../libraries/SPI</Value>
204+
<Value>../../../../../libraries/Wire</Value>
205+
</ListValues>
206+
</armgcccpp.compiler.directories.IncludePaths>
207+
<armgcccpp.compiler.optimization.level>Optimize (-O1)</armgcccpp.compiler.optimization.level>
208+
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
209+
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
210+
<armgcccpp.compiler.optimization.EnableLongCalls>False</armgcccpp.compiler.optimization.EnableLongCalls>
211+
<armgcccpp.compiler.optimization.DebugLevel>Maximum (-g3)</armgcccpp.compiler.optimization.DebugLevel>
212+
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
213+
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=c++98 -march=armv6-m</armgcccpp.compiler.miscellaneous.OtherFlags>
214+
<armgcccpp.linker.general.UseNewlibNano>True</armgcccpp.linker.general.UseNewlibNano>
215+
<armgcccpp.linker.libraries.Libraries>
216+
<ListValues>
217+
<Value>libm</Value>
218+
</ListValues>
219+
</armgcccpp.linker.libraries.Libraries>
220+
<armgcccpp.linker.libraries.LibrarySearchPaths>
221+
<ListValues>
222+
<Value>../../../../../variants/arduino_zero/linker_scripts/gcc</Value>
223+
</ListValues>
224+
</armgcccpp.linker.libraries.LibrarySearchPaths>
225+
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
226+
<armgcccpp.linker.memorysettings.ExternalRAM />
227+
<armgcccpp.linker.miscellaneous.LinkerFlags>--specs=nosys.specs -Tflash_with_bootloader.ld -march=armv6-m -save-temps</armgcccpp.linker.miscellaneous.LinkerFlags>
228+
<armgcccpp.assembler.general.IncludePaths>
229+
<ListValues>
230+
<Value>../../../arduino</Value>
231+
</ListValues>
232+
</armgcccpp.assembler.general.IncludePaths>
233+
<armgcccpp.assembler.debugging.DebugLevel>Default (-g)</armgcccpp.assembler.debugging.DebugLevel>
234+
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
235+
<armgcccpp.preprocessingassembler.general.IncludePaths>
236+
<ListValues>
237+
<Value>../../../arduino</Value>
238+
</ListValues>
239+
</armgcccpp.preprocessingassembler.general.IncludePaths>
240+
<armgcccpp.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcccpp.preprocessingassembler.debugging.DebugLevel>
241+
</ArmGccCpp>
223242
</ToolchainSettings>
224243
</PropertyGroup>
225244
<ItemGroup>

‎cores/validation/validation_core/test.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ void setup( void )
6464

6565
//**********************************************
6666
SERIAL_PORT_MONITOR.begin( 115200 ) ; // Output to EDBG Virtual COM Port
67+
SERIAL_PORT_HARDWARE_OPEN.begin( 57600 ) ;
6768

6869
// Test External Interrupt
6970
attachInterrupt( 3, Interrupt_Pin3, LOW ) ;
@@ -75,9 +76,16 @@ void setup( void )
7576
pcBuff = (char *)malloc(50);
7677

7778
strcpy(pcBuff, "CIAO");
79+
delayMicroseconds( 3 ) ;
7880
SERIAL_PORT_MONITOR.println("----");
7981
SERIAL_PORT_MONITOR.println(pcBuff); // Outputs garbage instead of "CIAO"
8082
SERIAL_PORT_MONITOR.println("----");
83+
delayMicroseconds( 50 ) ;
84+
SERIAL_PORT_HARDWARE_OPEN.println("----");
85+
delayMicroseconds( 15 ) ;
86+
SERIAL_PORT_HARDWARE_OPEN.println(pcBuff); // Outputs garbage instead of "CIAO"
87+
delayMicroseconds( 11 ) ;
88+
SERIAL_PORT_HARDWARE_OPEN.println("----");
8189
}
8290

8391
static void led_step1( void )
@@ -110,6 +118,9 @@ void loop( void )
110118
SERIAL_PORT_MONITOR.write( '-' ) ; // send a char
111119
SERIAL_PORT_MONITOR.write( "test1\n" ) ; // send a string
112120
SERIAL_PORT_MONITOR.write( "test2" ) ; // send another string
121+
SERIAL_PORT_HARDWARE_OPEN.write( '-' ) ; // send a char
122+
SERIAL_PORT_HARDWARE_OPEN.write( "test1\n" ) ; // send a string
123+
SERIAL_PORT_HARDWARE_OPEN.write( "test2" ) ; // send another string
113124

114125
// Test digitalRead: connect pin 2 to either GND or 3.3V. !!!! NOT on 5V pin !!!!
115126
pin_value=digitalRead( 2 ) ;

0 commit comments

Comments
 (0)