Skip to content

Commit 7365e20

Browse files
sm-teknicsm-teknic
committed
Release 1.0.14
1 parent 698ac20 commit 7365e20

File tree

4 files changed

+120
-1406
lines changed

4 files changed

+120
-1406
lines changed

‎TestSketch/TestSketch.cppproj‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
<EraseKey />
3131
<AsfFrameworkConfig>
3232
<framework-data>
33-
<options />
34-
<configurations />
35-
<files />
36-
<documentation help="" />
37-
<offline-documentation help="" />
38-
<dependencies>
39-
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.34.1" />
40-
</dependencies>
41-
</framework-data>
33+
<options />
34+
<configurations />
35+
<files />
36+
<documentation help="" />
37+
<offline-documentation help="" />
38+
<dependencies>
39+
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.39.0" />
40+
</dependencies>
41+
</framework-data>
4242
</AsfFrameworkConfig>
4343
<avrtool>custom</avrtool>
4444
<avrtoolserialnumber>
@@ -73,87 +73,87 @@
7373
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
7474
<ToolchainSettings>
7575
<ArmGccCpp>
76-
<armgcc.common.outputfiles.hex>False</armgcc.common.outputfiles.hex>
77-
<armgcc.common.outputfiles.lss>False</armgcc.common.outputfiles.lss>
78-
<armgcc.common.outputfiles.eep>False</armgcc.common.outputfiles.eep>
79-
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
80-
<armgcc.common.outputfiles.srec>False</armgcc.common.outputfiles.srec>
81-
<armgcc.compiler.symbols.DefSymbols>
82-
<ListValues>
83-
<Value>NDEBUG</Value>
84-
</ListValues>
85-
</armgcc.compiler.symbols.DefSymbols>
86-
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
87-
<armgcc.compiler.directories.IncludePaths>
88-
<ListValues>
89-
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
90-
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
91-
</ListValues>
92-
</armgcc.compiler.directories.IncludePaths>
93-
<armgcc.compiler.optimization.level>Optimize most (-O3)</armgcc.compiler.optimization.level>
94-
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
95-
<armgcc.compiler.optimization.PrepareDataForGarbageCollection>True</armgcc.compiler.optimization.PrepareDataForGarbageCollection>
96-
<armgcc.compiler.optimization.EnableLongCalls>False</armgcc.compiler.optimization.EnableLongCalls>
97-
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
98-
<armgcc.compiler.warnings.ExtraWarnings>True</armgcc.compiler.warnings.ExtraWarnings>
99-
<armgcc.compiler.miscellaneous.OtherFlags>-std=gnu11 --param max-inline-insns-single=50 -MMD -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcc.compiler.miscellaneous.OtherFlags>
100-
<armgcccpp.compiler.symbols.DefSymbols>
101-
<ListValues>
102-
<Value>NDEBUG</Value>
103-
</ListValues>
104-
</armgcccpp.compiler.symbols.DefSymbols>
105-
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
106-
<armgcccpp.compiler.directories.IncludePaths>
107-
<ListValues>
108-
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
109-
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
110-
<Value>../../Teknic/libClearCore/inc</Value>
111-
<Value>../../Teknic/LwIP/LwIP/port/include</Value>
112-
<Value>../../Teknic/LwIP/LwIP/src/include</Value>
113-
<Value>../../cores/arduino</Value>
114-
<Value>../../cores/arduino/api</Value>
115-
<Value>../../variants/clearcore</Value>
116-
</ListValues>
117-
</armgcccpp.compiler.directories.IncludePaths>
118-
<armgcccpp.compiler.optimization.level>Optimize most (-O3)</armgcccpp.compiler.optimization.level>
119-
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
120-
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
121-
<armgcccpp.compiler.optimization.EnableLongCalls>False</armgcccpp.compiler.optimization.EnableLongCalls>
122-
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
123-
<armgcccpp.compiler.warnings.ExtraWarnings>True</armgcccpp.compiler.warnings.ExtraWarnings>
124-
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=gnu++11 -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -MMD -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcccpp.compiler.miscellaneous.OtherFlags>
125-
<armgcccpp.linker.general.AdditionalSpecs>Use rdimon (semihosting) library (--specs=rdimon.specs)</armgcccpp.linker.general.AdditionalSpecs>
126-
<armgcccpp.linker.libraries.Libraries>
127-
<ListValues>
128-
<Value>arm_cortexM4lf_math</Value>
129-
<Value>libm</Value>
130-
</ListValues>
131-
</armgcccpp.linker.libraries.Libraries>
132-
<armgcccpp.linker.libraries.LibrarySearchPaths>
133-
<ListValues>
134-
<Value>%24(ProjectDir)\Device_Startup</Value>
135-
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Lib\GCC</Value>
136-
</ListValues>
137-
</armgcccpp.linker.libraries.LibrarySearchPaths>
138-
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
139-
<armgcccpp.linker.memorysettings.ExternalRAM />
140-
<armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash_with_bootloader.ld -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcccpp.linker.miscellaneous.LinkerFlags>
141-
<armgcccpp.assembler.general.IncludePaths>
142-
<ListValues>
143-
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
144-
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
145-
</ListValues>
146-
</armgcccpp.assembler.general.IncludePaths>
147-
<armgcccpp.assembler.debugging.DebugLevel>Default (-g)</armgcccpp.assembler.debugging.DebugLevel>
148-
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
149-
<armgcccpp.preprocessingassembler.general.IncludePaths>
150-
<ListValues>
151-
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
152-
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
153-
</ListValues>
154-
</armgcccpp.preprocessingassembler.general.IncludePaths>
155-
<armgcccpp.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcccpp.preprocessingassembler.debugging.DebugLevel>
156-
</ArmGccCpp>
76+
<armgcc.common.outputfiles.hex>False</armgcc.common.outputfiles.hex>
77+
<armgcc.common.outputfiles.lss>False</armgcc.common.outputfiles.lss>
78+
<armgcc.common.outputfiles.eep>False</armgcc.common.outputfiles.eep>
79+
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
80+
<armgcc.common.outputfiles.srec>False</armgcc.common.outputfiles.srec>
81+
<armgcc.compiler.symbols.DefSymbols>
82+
<ListValues>
83+
<Value>NDEBUG</Value>
84+
</ListValues>
85+
</armgcc.compiler.symbols.DefSymbols>
86+
<armgcc.compiler.directories.DefaultIncludePath>False</armgcc.compiler.directories.DefaultIncludePath>
87+
<armgcc.compiler.directories.IncludePaths>
88+
<ListValues>
89+
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
90+
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
91+
</ListValues>
92+
</armgcc.compiler.directories.IncludePaths>
93+
<armgcc.compiler.optimization.level>Optimize most (-O3)</armgcc.compiler.optimization.level>
94+
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
95+
<armgcc.compiler.optimization.PrepareDataForGarbageCollection>True</armgcc.compiler.optimization.PrepareDataForGarbageCollection>
96+
<armgcc.compiler.optimization.EnableLongCalls>False</armgcc.compiler.optimization.EnableLongCalls>
97+
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
98+
<armgcc.compiler.warnings.ExtraWarnings>True</armgcc.compiler.warnings.ExtraWarnings>
99+
<armgcc.compiler.miscellaneous.OtherFlags>-std=gnu11 --param max-inline-insns-single=50 -MMD -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcc.compiler.miscellaneous.OtherFlags>
100+
<armgcccpp.compiler.symbols.DefSymbols>
101+
<ListValues>
102+
<Value>NDEBUG</Value>
103+
</ListValues>
104+
</armgcccpp.compiler.symbols.DefSymbols>
105+
<armgcccpp.compiler.directories.DefaultIncludePath>False</armgcccpp.compiler.directories.DefaultIncludePath>
106+
<armgcccpp.compiler.directories.IncludePaths>
107+
<ListValues>
108+
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
109+
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
110+
<Value>../../Teknic/libClearCore/inc</Value>
111+
<Value>../../Teknic/LwIP/LwIP/port/include</Value>
112+
<Value>../../Teknic/LwIP/LwIP/src/include</Value>
113+
<Value>../../cores/arduino</Value>
114+
<Value>../../cores/arduino/api</Value>
115+
<Value>../../variants/clearcore</Value>
116+
</ListValues>
117+
</armgcccpp.compiler.directories.IncludePaths>
118+
<armgcccpp.compiler.optimization.level>Optimize most (-O3)</armgcccpp.compiler.optimization.level>
119+
<armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
120+
<armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</armgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
121+
<armgcccpp.compiler.optimization.EnableLongCalls>False</armgcccpp.compiler.optimization.EnableLongCalls>
122+
<armgcccpp.compiler.warnings.AllWarnings>True</armgcccpp.compiler.warnings.AllWarnings>
123+
<armgcccpp.compiler.warnings.ExtraWarnings>True</armgcccpp.compiler.warnings.ExtraWarnings>
124+
<armgcccpp.compiler.miscellaneous.OtherFlags>-std=gnu++11 -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -MMD -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcccpp.compiler.miscellaneous.OtherFlags>
125+
<armgcccpp.linker.general.AdditionalSpecs>Use rdimon (semihosting) library (--specs=rdimon.specs)</armgcccpp.linker.general.AdditionalSpecs>
126+
<armgcccpp.linker.libraries.Libraries>
127+
<ListValues>
128+
<Value>arm_cortexM4lf_math</Value>
129+
<Value>libm</Value>
130+
</ListValues>
131+
</armgcccpp.linker.libraries.Libraries>
132+
<armgcccpp.linker.libraries.LibrarySearchPaths>
133+
<ListValues>
134+
<Value>%24(ProjectDir)\Device_Startup</Value>
135+
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Lib\GCC</Value>
136+
</ListValues>
137+
</armgcccpp.linker.libraries.LibrarySearchPaths>
138+
<armgcccpp.linker.optimization.GarbageCollectUnusedSections>True</armgcccpp.linker.optimization.GarbageCollectUnusedSections>
139+
<armgcccpp.linker.memorysettings.ExternalRAM />
140+
<armgcccpp.linker.miscellaneous.LinkerFlags>-Tflash_with_bootloader.ld -mfloat-abi=hard -mfpu=fpv4-sp-d16</armgcccpp.linker.miscellaneous.LinkerFlags>
141+
<armgcccpp.assembler.general.IncludePaths>
142+
<ListValues>
143+
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
144+
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
145+
</ListValues>
146+
</armgcccpp.assembler.general.IncludePaths>
147+
<armgcccpp.assembler.debugging.DebugLevel>Default (-g)</armgcccpp.assembler.debugging.DebugLevel>
148+
<armgcccpp.preprocessingassembler.general.DefaultIncludePath>False</armgcccpp.preprocessingassembler.general.DefaultIncludePath>
149+
<armgcccpp.preprocessingassembler.general.IncludePaths>
150+
<ListValues>
151+
<Value>%24(PackRepoDir)\atmel\SAME53_DFP\1.1.118\include</Value>
152+
<Value>%24(PackRepoDir)\arm\CMSIS\4.5.0\CMSIS\Include\</Value>
153+
</ListValues>
154+
</armgcccpp.preprocessingassembler.general.IncludePaths>
155+
<armgcccpp.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcccpp.preprocessingassembler.debugging.DebugLevel>
156+
</ArmGccCpp>
157157
</ToolchainSettings>
158158
<PostBuildEvent>"$(SolutionDir)\Teknic\Tools\uf2-builder\Release\uf2-builder.exe" "$(OutputDirectory)\$(OutputFileName).bin" "$(OutputDirectory)\$(OutputFileName).uf2"</PostBuildEvent>
159159
</PropertyGroup>

‎keywords.txt‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ DigitalInOut KEYWORD1
3232
DigitalInOutAnalogOut KEYWORD1
3333
DigitalInOutHBridge KEYWORD1
3434
DmaManager KEYWORD1
35-
EncoderIn KEYWORD1
36-
EncoderInput KEYWORD1
3735
EthernetManager KEYWORD1
3836
EthernetMgr KEYWORD1
3937
EthernetTcp KEYWORD1
@@ -72,7 +70,6 @@ Accept KEYWORD2
7270
AdcIsInTimeout KEYWORD2
7371
AdcResolution KEYWORD2
7472
AdcTimeoutLimit KEYWORD2
75-
AddToPosition KEYWORD2
7673
AnalogVoltage KEYWORD2
7774
AnalogWrite KEYWORD2
7875
AnalogWriteUncalibrated KEYWORD2
@@ -93,16 +90,17 @@ Close KEYWORD2
9390
CodePresent KEYWORD2
9491
Connect KEYWORD2
9592
Connected KEYWORD2
96-
ConnectionState KEYWORD2
9793
ConnectionTimeout KEYWORD2
9894
ConnectorIndex KEYWORD2
95+
CruiseVelocityReached KEYWORD2
9996
CtsState KEYWORD2
10097
DacStoreCalibration KEYWORD2
10198
DataOrder KEYWORD2
10299
DhcpBegin KEYWORD2
103100
DiagnosticLedSweep KEYWORD2
104101
DnsIp KEYWORD2
105102
EIC_Handler KEYWORD2
103+
EStopDecelMax KEYWORD2
106104
Enable KEYWORD2
107105
EnableRequest KEYWORD2
108106
EnableTriggerPulse KEYWORD2
@@ -128,7 +126,6 @@ HlfbFilterLength KEYWORD2
128126
HlfbHasFallen KEYWORD2
129127
HlfbHasRisen KEYWORD2
130128
HlfbMode KEYWORD2
131-
HwPosition KEYWORD2
132129
Initialize KEYWORD2
133130
InputFallen KEYWORD2
134131
InputRegMask KEYWORD2
@@ -170,6 +167,7 @@ MotorInputClocking KEYWORD2
170167
MotorModeSet KEYWORD2
171168
Move KEYWORD2
172169
MoveStopAbrupt KEYWORD2
170+
MoveStopDecel KEYWORD2
173171
MoveVelocity KEYWORD2
174172
NetmaskIp KEYWORD2
175173
OutputCurrent KEYWORD2
@@ -195,7 +193,6 @@ PortClose KEYWORD2
195193
PortIsOpen KEYWORD2
196194
PortMode KEYWORD2
197195
PortOpen KEYWORD2
198-
Position KEYWORD2
199196
PositionRefSet KEYWORD2
200197
PwmDuty KEYWORD2
201198
Read KEYWORD2
@@ -239,7 +236,6 @@ StatusRegRisen KEYWORD2
239236
StatusRisen KEYWORD2
240237
StepsComplete KEYWORD2
241238
StopBits KEYWORD2
242-
SwapDirection KEYWORD2
243239
SysTickPeriodMicroSec KEYWORD2
244240
SysTickUpdate KEYWORD2
245241
Tc KEYWORD2
@@ -257,7 +253,7 @@ UpdateBegin KEYWORD2
257253
UpdateEnd KEYWORD2
258254
UserBlinkCode KEYWORD2
259255
VelMax KEYWORD2
260-
Velocity KEYWORD2
256+
VelocityRefCommanded KEYWORD2
261257
WaitForTransmitIdle KEYWORD2
262258
WaitForWriteFinish KEYWORD2
263259

@@ -438,9 +434,17 @@ CLEARCORE_PIN_IO3 LITERAL1
438434
CLEARCORE_PIN_IO4 LITERAL1
439435
CLEARCORE_PIN_IO5 LITERAL1
440436
CLEARCORE_PIN_M0 LITERAL1
437+
CLEARCORE_PIN_M0_INA LITERAL1
438+
CLEARCORE_PIN_M0_INB LITERAL1
441439
CLEARCORE_PIN_M1 LITERAL1
440+
CLEARCORE_PIN_M1_INA LITERAL1
441+
CLEARCORE_PIN_M1_INB LITERAL1
442442
CLEARCORE_PIN_M2 LITERAL1
443+
CLEARCORE_PIN_M2_INA LITERAL1
444+
CLEARCORE_PIN_M2_INB LITERAL1
443445
CLEARCORE_PIN_M3 LITERAL1
446+
CLEARCORE_PIN_M3_INA LITERAL1
447+
CLEARCORE_PIN_M3_INB LITERAL1
444448
CLOCK_RATE_HIGH LITERAL1
445449
CLOCK_RATE_LOW LITERAL1
446450
CLOCK_RATE_NORMAL LITERAL1
@@ -500,9 +504,17 @@ LINE_OFF LITERAL1
500504
LINE_ON LITERAL1
501505
LOW LITERAL1
502506
M0 LITERAL1
507+
M0_INA LITERAL1
508+
M0_INB LITERAL1
503509
M1 LITERAL1
510+
M1_INA LITERAL1
511+
M1_INB LITERAL1
504512
M2 LITERAL1
513+
M2_INA LITERAL1
514+
M2_INB LITERAL1
505515
M3 LITERAL1
516+
M3_INA LITERAL1
517+
M3_INB LITERAL1
506518
MISO LITERAL1
507519
MOSI LITERAL1
508520
MOTOR_ALL LITERAL1
@@ -513,6 +525,8 @@ MOTOR_M0M1 LITERAL1
513525
MOTOR_M2M3 LITERAL1
514526
MOTOR_MOVING LITERAL1
515527
MOTOR_READY LITERAL1
528+
MOVE_TARGET_ABSOLUTE LITERAL1
529+
MOVE_TARGET_REL_END_POSN LITERAL1
516530
NONE LITERAL1
517531
NUM_MOTOR_PAIRS LITERAL1
518532
NVM_LOC_DAC_SPAN LITERAL1

0 commit comments

Comments
 (0)