Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sm-teknic committed Mar 26, 2021
2 parents d33a748 + e55b94e commit 04d5ba7
Show file tree
Hide file tree
Showing 55 changed files with 1,033 additions and 536 deletions.
Binary file not shown.
Binary file removed bootloader/bootloader-ClearCore-v2.3.1-Teknic.3.elf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
51 changes: 51 additions & 0 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ DigitalInOut KEYWORD1
DigitalInOutAnalogOut KEYWORD1
DigitalInOutHBridge KEYWORD1
DmaManager KEYWORD1
EncoderIn KEYWORD1
EncoderInput KEYWORD1
EthernetManager KEYWORD1
EthernetMgr KEYWORD1
EthernetTcp KEYWORD1
Expand Down Expand Up @@ -70,6 +72,7 @@ Accept KEYWORD2
AdcIsInTimeout KEYWORD2
AdcResolution KEYWORD2
AdcTimeoutLimit KEYWORD2
AddToPosition KEYWORD2
AnalogVoltage KEYWORD2
AnalogWrite KEYWORD2
AnalogWriteUncalibrated KEYWORD2
Expand All @@ -79,13 +82,21 @@ AvailableForWrite KEYWORD2
Begin KEYWORD2
BlinkCode KEYWORD2
BlinkCodeClear KEYWORD2
BlockRead KEYWORD2
BlockWrite KEYWORD2
BrakeOutput KEYWORD2
Byte KEYWORD2
BytesAvailable KEYWORD2
CcioDiscover KEYWORD2
CcioRediscoverEnable KEYWORD2
CharGet KEYWORD2
CharPeek KEYWORD2
CharSize KEYWORD2
CheckTravelLimits KEYWORD2
ClearAlerts KEYWORD2
ClearFaults KEYWORD2
ClearFaultsActive KEYWORD2
ClearQuadratureError KEYWORD2
Close KEYWORD2
CodePresent KEYWORD2
Connect KEYWORD2
Expand All @@ -100,8 +111,11 @@ DhcpBegin KEYWORD2
DiagnosticLedSweep KEYWORD2
DnsIp KEYWORD2
EIC_Handler KEYWORD2
EStopConnector KEYWORD2
EStopDecelMax KEYWORD2
Enable KEYWORD2
EnableActiveLevel KEYWORD2
EnableConnector KEYWORD2
EnableRequest KEYWORD2
EnableTriggerPulse KEYWORD2
End KEYWORD2
Expand All @@ -112,6 +126,7 @@ FilterLength KEYWORD2
FilterReset KEYWORD2
FilterTc KEYWORD2
Filter_ms KEYWORD2
FinishNvmWrite KEYWORD2
FlowControl KEYWORD2
Flush KEYWORD2
FlushInput KEYWORD2
Expand All @@ -122,11 +137,20 @@ HBridgeState KEYWORD2
HandleFrameError KEYWORD2
HandleOverflow KEYWORD2
HandleParityError KEYWORD2
HlfbActiveLevel KEYWORD2
HlfbCarrier KEYWORD2
HlfbFilterLength KEYWORD2
HlfbHasFallen KEYWORD2
HlfbHasRisen KEYWORD2
HlfbInputStatus KEYWORD2
HlfbMode KEYWORD2
HwPosition KEYWORD2
IndexDetected KEYWORD2
IndexInverted KEYWORD2
IndexPosition KEYWORD2
Initialize KEYWORD2
InputAConnector KEYWORD2
InputBConnector KEYWORD2
InputFallen KEYWORD2
InputRegMask KEYWORD2
InputRisen KEYWORD2
Expand All @@ -151,16 +175,22 @@ IrqHandlerRx KEYWORD2
IrqHandlerTx KEYWORD2
IsInFault KEYWORD2
IsInHwFault KEYWORD2
IsValidInputPin KEYWORD2
IsValidOutputPin KEYWORD2
IsWritable KEYWORD2
LastOutput KEYWORD2
LimitSwitchNeg KEYWORD2
LimitSwitchPos KEYWORD2
LinkClose KEYWORD2
LocalIp KEYWORD2
LocalPort KEYWORD2
MacAddress KEYWORD2
Microseconds KEYWORD2
Mode KEYWORD2
MotorInACount KEYWORD2
MotorInADuty KEYWORD2
MotorInAState KEYWORD2
MotorInBCount KEYWORD2
MotorInBDuty KEYWORD2
MotorInBState KEYWORD2
MotorInputClocking KEYWORD2
Expand All @@ -169,6 +199,7 @@ Move KEYWORD2
MoveStopAbrupt KEYWORD2
MoveStopDecel KEYWORD2
MoveVelocity KEYWORD2
NegLimitActive KEYWORD2
NetmaskIp KEYWORD2
OutputCurrent KEYWORD2
OutputDirection KEYWORD2
Expand All @@ -193,8 +224,11 @@ PortClose KEYWORD2
PortIsOpen KEYWORD2
PortMode KEYWORD2
PortOpen KEYWORD2
PosLimitActive KEYWORD2
Position KEYWORD2
PositionRefSet KEYWORD2
PwmDuty KEYWORD2
QuadratureError KEYWORD2
Read KEYWORD2
Ready KEYWORD2
ReceivedFrameFlag KEYWORD2
Expand Down Expand Up @@ -234,8 +268,13 @@ StatusRT KEYWORD2
StatusRegFallen KEYWORD2
StatusRegRisen KEYWORD2
StatusRisen KEYWORD2
StepsCalculated KEYWORD2
StepsComplete KEYWORD2
StepsLastSample KEYWORD2
StepsPrevious KEYWORD2
StopBits KEYWORD2
SwapDirection KEYWORD2
Synchonized KEYWORD2
SysTickPeriodMicroSec KEYWORD2
SysTickUpdate KEYWORD2
Tc KEYWORD2
Expand All @@ -252,7 +291,9 @@ Update KEYWORD2
UpdateBegin KEYWORD2
UpdateEnd KEYWORD2
UserBlinkCode KEYWORD2
ValidateMove KEYWORD2
VelMax KEYWORD2
Velocity KEYWORD2
VelocityRefCommanded KEYWORD2
WaitForTransmitIdle KEYWORD2
WaitForWriteFinish KEYWORD2
Expand Down Expand Up @@ -472,6 +513,8 @@ FILTER_UNIT_RAW LITERAL1
FILTER_UNIT_SAMPLES LITERAL1
HIGH LITERAL1
HLFB_ASSERTED LITERAL1
HLFB_CARRIER_45_HZ LITERAL1
HLFB_CARRIER_482_HZ LITERAL1
HLFB_DEASSERTED LITERAL1
HLFB_HAS_MEASUREMENT LITERAL1
HLFB_MODE_HAS_BIPOLAR_PWM LITERAL1
Expand Down Expand Up @@ -527,6 +570,14 @@ MOTOR_MOVING LITERAL1
MOTOR_READY LITERAL1
MOVE_TARGET_ABSOLUTE LITERAL1
MOVE_TARGET_REL_END_POSN LITERAL1
MS_ACCEL LITERAL1
MS_CHANGE_DIR LITERAL1
MS_CRUISE LITERAL1
MS_DECEL LITERAL1
MS_DECEL_VEL LITERAL1
MS_END LITERAL1
MS_IDLE LITERAL1
MS_START LITERAL1
NONE LITERAL1
NUM_MOTOR_PAIRS LITERAL1
NVM_LOC_DAC_SPAN LITERAL1
Expand Down
8 changes: 4 additions & 4 deletions libraries/AnalogIO/ReadAnalogInput/ReadAnalogInput.ino
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
* voltage meter than the ClearCore's onboard LEDs.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -134,4 +134,4 @@ void loop() {

// Wait a second before the next reading.
delay(1000);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* ** Connect a device to IO-0 which takes in analog current.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -52,4 +52,4 @@ void loop() {
analogWrite(IO0, value, CURRENT);
delay(2);
}
}
}
8 changes: 4 additions & 4 deletions libraries/AnalogIO/WritePwmOutput/WritePwmOutput.ino
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* ** Connect a device that takes in a PWM signal to IO-1
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -54,4 +54,4 @@ void loop() {
// Output a high duty cycle for 1 second.
analogWrite(outputPin, 230);
delay(1000);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
* connectors.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* connector 0.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* built-in I/O LEDs toggle with the connector state.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -71,4 +71,4 @@ void loop() {

// Wait 1 second.
delay(1000);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* built-in I/O LED toggle with the connector state.
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -74,4 +74,4 @@ void loop() {
// until all the pulse cycles are complete.
OutputPulsesStart(OutputPin, 300, 500, 5, true);
delay(3000);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* ** None
*
* Links:
* ** web link to doxygen (all Examples)
* ** web link to ClearCore Manual (all Examples) <<FUTURE links to Getting started webpage/ ClearCore videos>>
* ** ClearCore Documentation: https://teknic-inc.github.io/ClearCore-library/
* ** ClearCore Manual: https://www.teknic.com/files/downloads/clearcore_user_manual.pdf
*
*
* Last Modified: 1/21/2020
* Copyright (c) 2020 Teknic Inc. This work is free to use, copy and distribute under the terms of
* the standard MIT permissive software license which can be found at https://opensource.org/licenses/MIT
*/
Expand Down Expand Up @@ -148,4 +148,4 @@ void loop() {

// Wait a couple seconds then repeat...
delay(2000);
}
}
Loading

0 comments on commit 04d5ba7

Please sign in to comment.