Skip to content

Commit cdfd4c2

Browse files
jcbudajcbuda
committed
modify usb initialization, add it in main.cpp
o Please enter the commit message for your changes. Lines starting
1 parent ecfe0c3 commit cdfd4c2

File tree

4 files changed

+89
-96
lines changed

4 files changed

+89
-96
lines changed

‎cores/arduino/USB/CDC.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <stdint.h>
2020

2121
// Include Atmel headers
22-
#include "arduino.h"
22+
#include "Arduino.h"
2323
#include "sam.h"
2424
#include "wiring_constants.h"
2525
#include "USBCore.h"

‎cores/arduino/main.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ int main( void )
2828
init();
2929

3030
delay(1);
31+
#if defined(USBCON)
32+
USBDevice.init();
33+
USBDevice.attach();
34+
#endif
3135

3236
setup();
3337

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

Lines changed: 84 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -137,89 +137,90 @@
137137
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
138138
<ToolchainSettings>
139139
<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>-Tflash.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>
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+
<Value>USBCON</Value>
176+
</ListValues>
177+
</armgcccpp.compiler.symbols.DefSymbols>
178+
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
179+
<armgcccpp.compiler.directories.IncludePaths>
180+
<ListValues>
181+
<Value>../../../../../../../tools/CMSIS/Device/ATMEL</Value>
182+
<Value>../../../../../../../tools/CMSIS/CMSIS/Include</Value>
183+
<Value>../../../../arduino</Value>
184+
<Value>../../../../arduino/USB</Value>
185+
<Value>../../../../../variants/arduino_zero</Value>
186+
<Value>../../../../../libraries/SPI</Value>
187+
<Value>../../../../../libraries/Wire</Value>
188+
</ListValues>
189+
</armgcccpp.compiler.directories.IncludePaths>
190+
<armgcccpp.compiler.optimization.level>Optimize (-O1)</armgcccpp.compiler.optimization.level>
191+
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
192+
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
193+
<armgcccpp.compiler.optimization.DebugLevel>Maximum (-g3)</armgcccpp.compiler.optimization.DebugLevel>
194+
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
195+
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=c++98</armgcccpp.compiler.miscellaneous.OtherFlags>
196+
<armgcccpp.linker.general.UseNewlibNano>True</armgcccpp.linker.general.UseNewlibNano>
197+
<armgcccpp.linker.libraries.Libraries>
198+
<ListValues>
199+
<Value>libm</Value>
200+
</ListValues>
201+
</armgcccpp.linker.libraries.Libraries>
202+
<armgcccpp.linker.libraries.LibrarySearchPaths>
203+
<ListValues>
204+
<Value>../../../../../variants/arduino_zero/linker_scripts/gcc</Value>
205+
</ListValues>
206+
</armgcccpp.linker.libraries.LibrarySearchPaths>
207+
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
208+
<armgcccpp.linker.memorysettings.ExternalRAM />
209+
<armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash.ld</armgcccpp.linker.miscellaneous.LinkerFlags>
210+
<armgcccpp.assembler.general.IncludePaths>
211+
<ListValues>
212+
<Value>../../../arduino</Value>
213+
</ListValues>
214+
</armgcccpp.assembler.general.IncludePaths>
215+
<armgcccpp.assembler.debugging.DebugLevel>Default (-g)</armgcccpp.assembler.debugging.DebugLevel>
216+
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
217+
<armgcccpp.preprocessingassembler.general.IncludePaths>
218+
<ListValues>
219+
<Value>../../../arduino</Value>
220+
</ListValues>
221+
</armgcccpp.preprocessingassembler.general.IncludePaths>
222+
<armgcccpp.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcccpp.preprocessingassembler.debugging.DebugLevel>
223+
</ArmGccCpp>
223224
</ToolchainSettings>
224225
</PropertyGroup>
225226
<ItemGroup>
@@ -380,14 +381,6 @@
380381
<SubType>compile</SubType>
381382
<Link>core\USB\samd21_device.h</Link>
382383
</Compile>
383-
<Compile Include="..\..\..\arduino\USB\samd21_host.c">
384-
<SubType>compile</SubType>
385-
<Link>core\USB\samd21_host.c</Link>
386-
</Compile>
387-
<Compile Include="..\..\..\arduino\USB\samd21_host.h">
388-
<SubType>compile</SubType>
389-
<Link>core\USB\samd21_host.h</Link>
390-
</Compile>
391384
<Compile Include="..\..\..\arduino\USB\USBAPI.h">
392385
<SubType>compile</SubType>
393386
<Link>core\USB\USBAPI.h</Link>

‎cores/validation/validation_usb_device/test_usb_device.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727

2828
void setup(void)
2929
{
30-
USBDevice.init();
31-
32-
USBDevice.attach();
33-
3430
#ifdef HID_ENABLED
3531
Mouse.begin();
3632

0 commit comments

Comments
 (0)