Skip to content

Commit 04d5ba7

Browse files
sm-teknicsm-teknic
committed
Merge branch 'release/1.1.1'
2 parents d33a748 + e55b94e commit 04d5ba7

File tree

55 files changed

+1033
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1033
-536
lines changed

‎bootloader/bootloader-ClearCore-v2.3.1-Teknic.3.bin‎

-16 KB
Binary file not shown.

‎bootloader/bootloader-ClearCore-v2.3.1-Teknic.3.elf‎

-351 KB
Binary file not shown.

‎bootloader/bootloader-ClearCore-v2.3.1-Teknic.4.bin‎

16 KB
Binary file not shown.

‎bootloader/bootloader-ClearCore-v2.3.1-Teknic.4.elf‎

333 KB
Binary file not shown.

‎bootloader/update-bootloader-ClearCore-v2.3.1-Teknic.3.uf2‎ renamed to ‎bootloader/update-bootloader-ClearCore-v2.3.1-Teknic.4.uf2‎

38.5 KB
Binary file not shown.

‎keywords.txt‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ DigitalInOut KEYWORD1
3232
DigitalInOutAnalogOut KEYWORD1
3333
DigitalInOutHBridge KEYWORD1
3434
DmaManager KEYWORD1
35+
EncoderIn KEYWORD1
36+
EncoderInput KEYWORD1
3537
EthernetManager KEYWORD1
3638
EthernetMgr KEYWORD1
3739
EthernetTcp KEYWORD1
@@ -70,6 +72,7 @@ Accept KEYWORD2
7072
AdcIsInTimeout KEYWORD2
7173
AdcResolution KEYWORD2
7274
AdcTimeoutLimit KEYWORD2
75+
AddToPosition KEYWORD2
7376
AnalogVoltage KEYWORD2
7477
AnalogWrite KEYWORD2
7578
AnalogWriteUncalibrated KEYWORD2
@@ -79,13 +82,21 @@ AvailableForWrite KEYWORD2
7982
Begin KEYWORD2
8083
BlinkCode KEYWORD2
8184
BlinkCodeClear KEYWORD2
85+
BlockRead KEYWORD2
86+
BlockWrite KEYWORD2
87+
BrakeOutput KEYWORD2
8288
Byte KEYWORD2
8389
BytesAvailable KEYWORD2
8490
CcioDiscover KEYWORD2
8591
CcioRediscoverEnable KEYWORD2
8692
CharGet KEYWORD2
8793
CharPeek KEYWORD2
8894
CharSize KEYWORD2
95+
CheckTravelLimits KEYWORD2
96+
ClearAlerts KEYWORD2
97+
ClearFaults KEYWORD2
98+
ClearFaultsActive KEYWORD2
99+
ClearQuadratureError KEYWORD2
89100
Close KEYWORD2
90101
CodePresent KEYWORD2
91102
Connect KEYWORD2
@@ -100,8 +111,11 @@ DhcpBegin KEYWORD2
100111
DiagnosticLedSweep KEYWORD2
101112
DnsIp KEYWORD2
102113
EIC_Handler KEYWORD2
114+
EStopConnector KEYWORD2
103115
EStopDecelMax KEYWORD2
104116
Enable KEYWORD2
117+
EnableActiveLevel KEYWORD2
118+
EnableConnector KEYWORD2
105119
EnableRequest KEYWORD2
106120
EnableTriggerPulse KEYWORD2
107121
End KEYWORD2
@@ -112,6 +126,7 @@ FilterLength KEYWORD2
112126
FilterReset KEYWORD2
113127
FilterTc KEYWORD2
114128
Filter_ms KEYWORD2
129+
FinishNvmWrite KEYWORD2
115130
FlowControl KEYWORD2
116131
Flush KEYWORD2
117132
FlushInput KEYWORD2
@@ -122,11 +137,20 @@ HBridgeState KEYWORD2
122137
HandleFrameError KEYWORD2
123138
HandleOverflow KEYWORD2
124139
HandleParityError KEYWORD2
140+
HlfbActiveLevel KEYWORD2
141+
HlfbCarrier KEYWORD2
125142
HlfbFilterLength KEYWORD2
126143
HlfbHasFallen KEYWORD2
127144
HlfbHasRisen KEYWORD2
145+
HlfbInputStatus KEYWORD2
128146
HlfbMode KEYWORD2
147+
HwPosition KEYWORD2
148+
IndexDetected KEYWORD2
149+
IndexInverted KEYWORD2
150+
IndexPosition KEYWORD2
129151
Initialize KEYWORD2
152+
InputAConnector KEYWORD2
153+
InputBConnector KEYWORD2
130154
InputFallen KEYWORD2
131155
InputRegMask KEYWORD2
132156
InputRisen KEYWORD2
@@ -151,16 +175,22 @@ IrqHandlerRx KEYWORD2
151175
IrqHandlerTx KEYWORD2
152176
IsInFault KEYWORD2
153177
IsInHwFault KEYWORD2
178+
IsValidInputPin KEYWORD2
179+
IsValidOutputPin KEYWORD2
154180
IsWritable KEYWORD2
155181
LastOutput KEYWORD2
182+
LimitSwitchNeg KEYWORD2
183+
LimitSwitchPos KEYWORD2
156184
LinkClose KEYWORD2
157185
LocalIp KEYWORD2
158186
LocalPort KEYWORD2
159187
MacAddress KEYWORD2
160188
Microseconds KEYWORD2
161189
Mode KEYWORD2
190+
MotorInACount KEYWORD2
162191
MotorInADuty KEYWORD2
163192
MotorInAState KEYWORD2
193+
MotorInBCount KEYWORD2
164194
MotorInBDuty KEYWORD2
165195
MotorInBState KEYWORD2
166196
MotorInputClocking KEYWORD2
@@ -169,6 +199,7 @@ Move KEYWORD2
169199
MoveStopAbrupt KEYWORD2
170200
MoveStopDecel KEYWORD2
171201
MoveVelocity KEYWORD2
202+
NegLimitActive KEYWORD2
172203
NetmaskIp KEYWORD2
173204
OutputCurrent KEYWORD2
174205
OutputDirection KEYWORD2
@@ -193,8 +224,11 @@ PortClose KEYWORD2
193224
PortIsOpen KEYWORD2
194225
PortMode KEYWORD2
195226
PortOpen KEYWORD2
227+
PosLimitActive KEYWORD2
228+
Position KEYWORD2
196229
PositionRefSet KEYWORD2
197230
PwmDuty KEYWORD2
231+
QuadratureError KEYWORD2
198232
Read KEYWORD2
199233
Ready KEYWORD2
200234
ReceivedFrameFlag KEYWORD2
@@ -234,8 +268,13 @@ StatusRT KEYWORD2
234268
StatusRegFallen KEYWORD2
235269
StatusRegRisen KEYWORD2
236270
StatusRisen KEYWORD2
271+
StepsCalculated KEYWORD2
237272
StepsComplete KEYWORD2
273+
StepsLastSample KEYWORD2
274+
StepsPrevious KEYWORD2
238275
StopBits KEYWORD2
276+
SwapDirection KEYWORD2
277+
Synchonized KEYWORD2
239278
SysTickPeriodMicroSec KEYWORD2
240279
SysTickUpdate KEYWORD2
241280
Tc KEYWORD2
@@ -252,7 +291,9 @@ Update KEYWORD2
252291
UpdateBegin KEYWORD2
253292
UpdateEnd KEYWORD2
254293
UserBlinkCode KEYWORD2
294+
ValidateMove KEYWORD2
255295
VelMax KEYWORD2
296+
Velocity KEYWORD2
256297
VelocityRefCommanded KEYWORD2
257298
WaitForTransmitIdle KEYWORD2
258299
WaitForWriteFinish KEYWORD2
@@ -472,6 +513,8 @@ FILTER_UNIT_RAW LITERAL1
472513
FILTER_UNIT_SAMPLES LITERAL1
473514
HIGH LITERAL1
474515
HLFB_ASSERTED LITERAL1
516+
HLFB_CARRIER_45_HZ LITERAL1
517+
HLFB_CARRIER_482_HZ LITERAL1
475518
HLFB_DEASSERTED LITERAL1
476519
HLFB_HAS_MEASUREMENT LITERAL1
477520
HLFB_MODE_HAS_BIPOLAR_PWM LITERAL1
@@ -527,6 +570,14 @@ MOTOR_MOVING LITERAL1
527570
MOTOR_READY LITERAL1
528571
MOVE_TARGET_ABSOLUTE LITERAL1
529572
MOVE_TARGET_REL_END_POSN LITERAL1
573+
MS_ACCEL LITERAL1
574+
MS_CHANGE_DIR LITERAL1
575+
MS_CRUISE LITERAL1
576+
MS_DECEL LITERAL1
577+
MS_DECEL_VEL LITERAL1
578+
MS_END LITERAL1
579+
MS_IDLE LITERAL1
580+
MS_START LITERAL1
530581
NONE LITERAL1
531582
NUM_MOTOR_PAIRS LITERAL1
532583
NVM_LOC_DAC_SPAN LITERAL1

‎libraries/AnalogIO/ReadAnalogInput/ReadAnalogInput.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
* voltage meter than the ClearCore's onboard LEDs.
2424
*
2525
* Links:
26-
* ** web link to doxygen (all Examples)
27-
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
26+
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
27+
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
28+
*
2829
*
29-
* Last Modified: 1/21/2020
3030
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
3131
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
3232
*/
@@ -134,4 +134,4 @@ void loop() {
134134

135135
// Wait a second before the next reading.
136136
delay(1000);
137-
}
137+
}

‎libraries/AnalogIO/WriteAnalogCurrentOutput/WriteAnalogCurrentOutput.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* ** Connect a device to IO-0 which takes in analog current.
1515
*
1616
* Links:
17-
* ** web link to doxygen (all Examples)
18-
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
17+
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
18+
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
19+
*
1920
*
20-
* Last Modified: 1/21/2020
2121
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
2222
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
2323
*/
@@ -52,4 +52,4 @@ void loop() {
5252
analogWrite(IO0, value, CURRENT);
5353
delay(2);
5454
}
55-
}
55+
}

‎libraries/AnalogIO/WritePwmOutput/WritePwmOutput.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* ** Connect a device that takes in a PWM signal to IO-1
1414
*
1515
* Links:
16-
* ** web link to doxygen (all Examples)
17-
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
16+
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
17+
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
18+
*
1819
*
19-
* Last Modified: 1/21/2020
2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
2121
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
2222
*/
@@ -54,4 +54,4 @@ void loop() {
5454
// Output a high duty cycle for 1 second.
5555
analogWrite(outputPin, 230);
5656
delay(1000);
57-
}
57+
}

‎libraries/CCIO-8/ClearCoreIOExpansionBoard/ClearCoreIOExpansionBoard.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
* connectors.
2222
*
2323
* Links:
24-
* ** web link to doxygen (all Examples)
25-
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
24+
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
25+
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
26+
*
2627
*
27-
* Last Modified: 1/21/2020
2828
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
2929
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
3030
*/

0 commit comments

Comments
 (0)