Skip to content

Commit 9ddadb8

Browse files
committed
Device_Update: Move _devContextBytes next to _initDevCtx
1 parent 718cf0d commit 9ddadb8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Firmware/RTK_Everywhere/Device_Update.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ typedef struct _DEVICE_FIRMWARE_INFO
212212
DEVICE_WRITE _write; // Perform the firmware writes
213213
DEVICE_CLOSE _close; // Perform firmware write cleanup
214214
INIT_DEV_CTX _initDevCtx; // Initialize the device specific context
215+
size_t _devContextBytes; // Size of device specific context buffer
215216
bool _crcNeeded; // Is file CRC needed to do firmware update
216217
bool _useNvm; // Allow copy to NVM
217-
size_t _devContextBytes; // Size of device specific context buffer
218218
size_t _writeBufferBytes; // Number of bytes needed for the write buffer
219219
size_t _maxWriteBytes; // Maximum write packet size
220220

@@ -319,13 +319,13 @@ bool deviceFirmwareUpdateBegin(bool doAll,
319319
// Note: Use the JSON based OTA to get a new ESP32 image when the
320320
// parsing fails due to website changes on the servers below!
321321
const DEVICE_FIRMWARE_INFO deviceFirmwareInfo[] =
322-
{// Name present Directory NameData Extension Firmware version Reset Open Write Close InitDevCtx CRC useNvm Context Bytes Buffer Bytes Max Write Bytes Server Branch dPrefix1 dPrefix2 dirEnd nPrefix nameEnd Raw Branch
323-
{"ESP32", nullptr, nullptr, "Firmware_v", ".bin", dfuEsp32GetFirmwareVersion, nullptr, dfuEsp32Open, dfuEsp32Write, dfuEsp32Close, nullptr, false, false, 0, 0, 0, dfuGithub, nullptr, dfuTree, dfuItems, dfuListEnd, dfuName, dfuNameEnd, dfuRawHead},
322+
{// Name present Directory NameData Extension Firmware version Reset Open Write Close InitDevCtx Context Bytes CRC useNvm Buffer Bytes Max Write Bytes Server Branch dPrefix1 dPrefix2 dirEnd nPrefix nameEnd Raw Branch
323+
{"ESP32", nullptr, nullptr, "Firmware_v", ".bin", dfuEsp32GetFirmwareVersion, nullptr, dfuEsp32Open, dfuEsp32Write, dfuEsp32Close, nullptr, 0, false, false, 0, 0, dfuGithub, nullptr, dfuTree, dfuItems, dfuListEnd, dfuName, dfuNameEnd, dfuRawHead},
324324
// ESP32 must be the first entry in the list, p command does list in reverse
325325

326326
// GNSS devices
327327
#ifdef COMPILE_LG290P
328-
{"LG290P", &present.gnss_lg290p, "/gnss/lg290p", "LG290P", ".pkg", dfuGnssGetFirmwareVersion, dfuLg290pReset, dfuLg290pOpen, dfuLg290pWrite, dfuLg290pClose, nullptr, true, false, 0, DFU_LG290P_BYTES, DFU_LG290P_MAX_PAYLOAD_SIZE, dfuGithub, dfuRawHead, dfuFileTree, dfuItems, dfuListEnd, dfuName, dfuNameEnd, dfuRawHead},
328+
{"LG290P", &present.gnss_lg290p, "/gnss/lg290p", "LG290P", ".pkg", dfuGnssGetFirmwareVersion, dfuLg290pReset, dfuLg290pOpen, dfuLg290pWrite, dfuLg290pClose, nullptr, 0, true, false, DFU_LG290P_BYTES, DFU_LG290P_MAX_PAYLOAD_SIZE, dfuGithub, dfuRawHead, dfuFileTree, dfuItems, dfuListEnd, dfuName, dfuNameEnd, dfuRawHead},
329329
#endif // COMPILE_LG290P
330330
};
331331
const int deviceFirmwareInfoCount = sizeof(deviceFirmwareInfo) / sizeof(deviceFirmwareInfo[0]);

0 commit comments

Comments
 (0)