This commit is contained in:
Bertrand Songis
2021-02-11 17:50:43 +01:00
parent 4948f98f06
commit 4a2e20815f
7 changed files with 40 additions and 56 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ bool isBootloader(const char * filename)
return isBootloaderStart(buffer);
}
void BootloaderDeviceFirmwareUpdate::flashFirmware(const char *filename, ProgressHandler progressHandler)
void BootloaderFirmwareUpdate::flashFirmware(const char * filename, ProgressHandler progressHandler)
{
FIL file;
uint8_t buffer[1024];
+2 -13
View File
@@ -18,23 +18,12 @@
* GNU General Public License for more details.
*/
#ifndef _BOOTLOADER_FLASH_H_
#define _BOOTLOADER_FLASH_H_
#pragma once
bool isBootloader(const char * filename);
class BootloaderDeviceFirmwareUpdate
class BootloaderFirmwareUpdate
{
public:
explicit BootloaderDeviceFirmwareUpdate(ModuleIndex module):
module(module)
{
}
void flashFirmware(const char * filename, ProgressHandler progressHandler);
protected:
ModuleIndex module;
};
#endif // _BOOTLOADER_FLASH_H_
+15 -14
View File
@@ -34,15 +34,18 @@
For example: REM multi-stm-bcsid-01020176
*/
class MultiFirmwareInformation {
class MultiFirmwareInformation
{
public:
enum MultiFirmwareBoardType {
enum MultiFirmwareBoardType
{
FIRMWARE_MULTI_AVR = 0,
FIRMWARE_MULTI_STM,
FIRMWARE_MULTI_ORX,
};
enum MultiFirmwareTelemetryType {
enum MultiFirmwareTelemetryType
{
FIRMWARE_MULTI_TELEM_NONE = 0,
FIRMWARE_MULTI_TELEM_MULTI_STATUS, // erSkyTX
FIRMWARE_MULTI_TELEM_MULTI_TELEMETRY, // OpenTX
@@ -70,12 +73,12 @@ class MultiFirmwareInformation {
bool isMultiInternalFirmware() const
{
return (boardType == FIRMWARE_MULTI_STM && optibootSupport == true && bootloaderCheck == true && telemetryType == FIRMWARE_MULTI_TELEM_MULTI_TELEMETRY);
return (boardType == FIRMWARE_MULTI_STM && optibootSupport && bootloaderCheck && telemetryType == FIRMWARE_MULTI_TELEM_MULTI_TELEMETRY);
}
bool isMultiExternalFirmware() const
{
return ((telemetryInversion == true || boardType == FIRMWARE_MULTI_STM ) && optibootSupport == true && bootloaderCheck == true && telemetryType == FIRMWARE_MULTI_TELEM_MULTI_TELEMETRY);
return ((telemetryInversion || boardType == FIRMWARE_MULTI_STM ) && optibootSupport && bootloaderCheck && telemetryType == FIRMWARE_MULTI_TELEM_MULTI_TELEMETRY);
}
const char * readMultiFirmwareInformation(const char * filename);
@@ -100,23 +103,21 @@ class MultiFirmwareInformation {
const char * readV2Signature(const char * buffer);
};
enum MultiModuleType {
enum MultiModuleType
{
MULTI_TYPE_MULTIMODULE = 0,
MULTI_TYPE_ELRS,
};
class MultiDeviceFirmwareUpdate {
class MultiDeviceFirmwareUpdate
{
public:
explicit MultiDeviceFirmwareUpdate(ModuleIndex module):
module(module)
explicit MultiDeviceFirmwareUpdate(ModuleIndex module, MultiModuleType type):
module(module),
type(type)
{
}
void setType(MultiModuleType value)
{
type = value;
}
bool flashFirmware(const char * filename, ProgressHandler progressHandler);
protected: