Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dc42 committed Aug 9, 2024
1 parent 70883e1 commit 62c2262
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/BoardType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,17 +398,17 @@ bool IdentifyBoard(CanAddress& defaultAddress, bool& doHardwareReset, bool& useA
AnalogIn::Init(CommonAdcDevice);
SetPinFunction(BoardTypePin, GpioPinFunction::B);
boardTypeIndex = ReadAndQuantise(BoardTypeAdcChannel, BoardIdDecisionPoints, ARRAY_SIZE(BoardIdDecisionPoints));
ClearPinFunction(BoardTypePin);

if (boardTypeIndex == (unsigned int)BoardId::ate)
{
// We need to read the second board ID pin
SetPinFunction(BoardType2Pin, GpioPinFunction::B); // ATE has a second board type pin
boardTypeIndex = (unsigned int)BoardId::ate_base + ReadAndQuantise(BoardType2AdcChannel, BoardId2DecisionPoints, ARRAY_SIZE(BoardId2DecisionPoints));
ClearPinFunction(BoardType2Pin);
}

AnalogIn::Disable(CommonAdcDevice); // finished using the ADC
ClearPinFunction(BoardTypePin);
ClearPinFunction(BoardType2Pin);

// Set up the hardware and default CAN address as appropriate
// Determine whether we need to do a hardware reset
Expand Down
1 change: 0 additions & 1 deletion src/Config/SAMC21config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ constexpr uint8_t BoardType2AdcChannel = 4;

constexpr Pin GlobalTmc22xxEnablePin_Tool1LC = PortBPin(2);
constexpr Pin OutPins_Tool1LC[] = { PortAPin(11), PortAPin(10), PortBPin(11) };
constexpr Pin ButtonPins_Tool1LC[] = { PortBPin(22), PortBPin(23) };

constexpr Pin CanResetPin_Tool1LC = PortBPin(22); // first button pin
constexpr Pin CanResetPin_SZP = PortAPin(18);
Expand Down
2 changes: 1 addition & 1 deletion src/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
#ifndef SRC_VERSION_H_
#define SRC_VERSION_H_

#define VERSION_TEXT "2.11 (2024-08-02)"
#define VERSION_TEXT "2.11 (2024-08-09)"

#endif /* SRC_VERSION_H_ */

0 comments on commit 62c2262

Please sign in to comment.