From 62c22621e50f3040ff15e918aefc7fd490f2186c Mon Sep 17 00:00:00 2001 From: David Crocker Date: Fri, 9 Aug 2024 09:50:09 +0100 Subject: [PATCH] Minor changes --- src/BoardType.cpp | 4 ++-- src/Config/SAMC21config.h | 1 - src/Version.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/BoardType.cpp b/src/BoardType.cpp index d564e93..885e018 100644 --- a/src/BoardType.cpp +++ b/src/BoardType.cpp @@ -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 diff --git a/src/Config/SAMC21config.h b/src/Config/SAMC21config.h index c32e5e3..fe47e6d 100644 --- a/src/Config/SAMC21config.h +++ b/src/Config/SAMC21config.h @@ -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); diff --git a/src/Version.h b/src/Version.h index dd2e769..b213c1b 100644 --- a/src/Version.h +++ b/src/Version.h @@ -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_ */