diff options
| -rw-r--r-- | HTTP requests.md | 2 | ||||
| -rw-r--r-- | src/DuetNG/Pins_DuetNG.h | 2 | ||||
| -rw-r--r-- | src/Platform.cpp | 12 | ||||
| -rw-r--r-- | src/Platform.h | 3 | ||||
| -rw-r--r-- | src/Version.h | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/HTTP requests.md b/HTTP requests.md index 2f12e1c4..3d3a787b 100644 --- a/HTTP requests.md +++ b/HTTP requests.md @@ -57,6 +57,8 @@ Officially supported board types are: | duetwifi102 | Duet WiFi v1.02 || | duetethernet10 | Duet Ethernet v1.0 || | duetethernet102 | Duet Ethernet v1.02 || +| duet2sbc10 | Duet 2 v1.0 + SBC || +| duet2sbc102 | Duet 2 v1.02 + SBC || | duetmaestro100 | Duet Maestro v1.0 || | duet3mb6hc | Duet 3 v0.6 || diff --git a/src/DuetNG/Pins_DuetNG.h b/src/DuetNG/Pins_DuetNG.h index cf129355..c4dc9a18 100644 --- a/src/DuetNG/Pins_DuetNG.h +++ b/src/DuetNG/Pins_DuetNG.h @@ -13,7 +13,7 @@ #if defined(USE_SBC) #define FIRMWARE_NAME "RepRapFirmware for Duet 2 + SBC" -#define DEFAULT_BOARD_TYPE BoardType::Duet2SBC +#define DEFAULT_BOARD_TYPE BoardType::Duet2SBC_10 #define IAP_FIRMWARE_FILE "Duet2Firmware_" BOARD_SHORT_NAME_SBC ".bin" #define IAP_UPDATE_FILE "Duet2_SDiap_" BOARD_SHORT_NAME_SBC ".bin" #define IAP_UPDATE_FILE_SBC "Duet2_SBCiap_" BOARD_SHORT_NAME_SBC ".bin" diff --git a/src/Platform.cpp b/src/Platform.cpp index 9495ea22..8fbc3f00 100644 --- a/src/Platform.cpp +++ b/src/Platform.cpp @@ -3693,6 +3693,9 @@ void Platform::SetBoardType(BoardType bt) noexcept pinMode(VssaSensePin, INPUT); } +# if defined(USE_SBC) + board = (vssaSenseWorking) ? BoardType::Duet2SBC_102 : BoardType::Duet2SBC_10; +# else // Test whether the Ethernet module is present if (digitalRead(W5500ModuleSensePin)) // the Ethernet module has this pin grounded { @@ -3702,6 +3705,7 @@ void Platform::SetBoardType(BoardType bt) noexcept { board = (vssaSenseWorking) ? BoardType::DuetEthernet_102 : BoardType::DuetEthernet_10; } +# endif #elif defined(DUET_M) board = BoardType::DuetM_10; #elif defined(DUET_06_085) @@ -3748,6 +3752,8 @@ const char* Platform::GetElectronicsString() const noexcept case BoardType::DuetWiFi_102: return "Duet WiFi 1.02 or later"; case BoardType::DuetEthernet_10: return "Duet Ethernet 1.0 or 1.01"; case BoardType::DuetEthernet_102: return "Duet Ethernet 1.02 or later"; + case BoardType::Duet2SBC_10: return "Duet 2 1.0 or 1.01 + SBC"; + case BoardType::Duet2SBC_102: return "Duet 2 1.02 or later + SBC"; #elif defined(DUET_M) case BoardType::DuetM_10: return "Duet Maestro 1.0"; #elif defined(DUET_06_085) @@ -3786,6 +3792,8 @@ const char* Platform::GetBoardString() const noexcept case BoardType::DuetWiFi_102: return "duetwifi102"; case BoardType::DuetEthernet_10: return "duetethernet10"; case BoardType::DuetEthernet_102: return "duetethernet102"; + case BoardType::Duet2SBC_10: return "duet2sbc10"; + case BoardType::Duet2SBC_102: return "duet2sbc102"; #elif defined(DUET_M) case BoardType::DuetM_10: return "duetmaestro100"; #elif defined(DUET_06_085) @@ -3819,14 +3827,14 @@ bool Platform::IsDuetWiFi() const noexcept const char *Platform::GetBoardName() const { - return board == BoardType::Duet2SBC + return (board == BoardType::Duet2SBC_10 || board == BoardType::Duet2SBC_102) ? BOARD_NAME_SBC : (IsDuetWiFi()) ? BOARD_NAME_WIFI : BOARD_NAME_ETHERNET; } const char *Platform::GetBoardShortName() const { - return board == BoardType::Duet2SBC + return (board == BoardType::Duet2SBC_10 || board == BoardType::Duet2SBC_102) ? BOARD_SHORT_NAME_SBC : (IsDuetWiFi()) ? BOARD_SHORT_NAME_WIFI : BOARD_SHORT_NAME_ETHERNET; } diff --git a/src/Platform.h b/src/Platform.h index 15487372..4fda7627 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -123,7 +123,8 @@ enum class BoardType : uint8_t DuetWiFi_102 = 2, DuetEthernet_10 = 3, DuetEthernet_102 = 4, - Duet2SBC = 5, + Duet2SBC_10 = 5, + Duet2SBC_102 = 6, #elif defined(DUET_M) DuetM_10 = 1, #elif defined(DUET_06_085) diff --git a/src/Version.h b/src/Version.h index 7328ac1f..db94ee51 100644 --- a/src/Version.h +++ b/src/Version.h @@ -19,7 +19,7 @@ #endif #ifndef DATE -# define DATE "2020-05-15b1" +# define DATE "2020-05-19b1" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |