diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-12-13 19:21:27 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-12-13 19:21:27 +0300 |
| commit | c42fc40d45958489e1d84e5e88d716f98645b4e0 (patch) | |
| tree | 81e74c8add3d6d79504f457fe9efd506a6893b50 /src/DuetNG | |
| parent | 330ba1b67a7a010dcec81fa5108b45204e1c639a (diff) | |
Changed the IAP filenames and start addresses
Diffstat (limited to 'src/DuetNG')
| -rw-r--r-- | src/DuetNG/Pins_DuetNG.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/DuetNG/Pins_DuetNG.h b/src/DuetNG/Pins_DuetNG.h index 036a1277..45178e70 100644 --- a/src/DuetNG/Pins_DuetNG.h +++ b/src/DuetNG/Pins_DuetNG.h @@ -12,24 +12,27 @@ #define BOARD_SHORT_NAME_SBC "2SBC" #if defined(USE_SBC) -#define FIRMWARE_NAME "RepRapFirmware for Duet 2 + SBC" + +#define FIRMWARE_NAME "RepRapFirmware for Duet 2 SBC" #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" +#define IAP_FIRMWARE_FILE "Duet2Firmware_SBC.bin" +#define IAP_UPDATE_FILE_SBC "Duet2_SBCiap32_SBC.bin" constexpr size_t NumFirmwareUpdateModules = 5; // 0 = mainboard, 4 = PanelDue, values in between unused + #else + #define FIRMWARE_NAME "RepRapFirmware for Duet 2 WiFi/Ethernet" #define DEFAULT_BOARD_TYPE BoardType::DuetWiFi_10 #define IAP_FIRMWARE_FILE "Duet2CombinedFirmware.bin" -#define IAP_UPDATE_FILE "Duet2CombinedIAP.bin" // using the same IAP file for both Duet WiFi and Duet Ethernet +#define IAP_UPDATE_FILE "Duet2_SDiap32_WiFiEth.bin" // using the same IAP file for both Duet WiFi and Duet Ethernet #define WIFI_FIRMWARE_FILE "DuetWiFiServer.bin" constexpr size_t NumFirmwareUpdateModules = 5; // 4 modules, plus one for manual upload to WiFi module (module 2 is now unused) + #endif -constexpr uint32_t IAP_IMAGE_START = 0x20010000; // IAP is loaded into the second 64kb of RAM +constexpr uint32_t IAP_IMAGE_START = 0x20018000; // IAP is loaded into the last 32kb of RAM // Features definition #define HAS_LWIP_NETWORKING 0 |