FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to force overwrite firmware for OSTC4.

Browse Source 
In order to support development of the open source firmware of the
OSTC4.
This is needed in order to be able to install firmware with the same
version number multiple times during development and testing.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2023-03-03 01:04:42 +13:00
parent c288effa01
commit 46d4bee8ab
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libdivecomputer/hw_ostc3.h
View File

@ -22,6 +22,8 @@
#ifndef DC_HW_OSTC3_H
#define DC_HW_OSTC3_H
#include <stdbool.h>
#include "common.h"
#include "device.h"
#include "datetime.h"
@ -55,7 +57,7 @@ dc_status_t
hw_ostc3_device_config_reset (dc_device_t *abstract);
dc_status_t
hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename);
hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename, bool forceUpdate);
#ifdef __cplusplus
}

12
src/hw_ostc3.c
View File

@ -1506,7 +1506,7 @@ hw_ostc3_device_fwupdate3 (dc_device_t *abstract, const char *filename)
}
static dc_status_t
hw_ostc3_device_fwupdate4 (dc_device_t *abstract, const char *filename)
hw_ostc3_device_fwupdate4 (dc_device_t *abstract, const char *filename, bool forceUpdate)
{
dc_status_t status = DC_STATUS_SUCCESS;
hw_ostc3_device_t *device = (hw_ostc3_device_t *) abstract;
@ -1577,7 +1577,7 @@ hw_ostc3_device_fwupdate4 (dc_device_t *abstract, const char *filename)
// Upload the firmware blob.
// The update is skipped if the two versions are already
// identical, or if the blob is not present on the device.
if (memcmp(data + offset + 12, fwinfo, sizeof(fwinfo)) != 0 &&
if ((memcmp(data + offset + 12, fwinfo, sizeof(fwinfo)) != 0 || forceUpdate) &&
!array_isequal(fwinfo, sizeof(fwinfo), 0xFF))
{
status = hw_ostc3_transfer (device, &progress, S_UPLOAD,
@ -1600,7 +1600,7 @@ error:
}
dc_status_t
hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename)
hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename, bool forceUpdate)
{
dc_status_t status = DC_STATUS_SUCCESS;
hw_ostc3_device_t *device = (hw_ostc3_device_t *) abstract;
@ -1615,8 +1615,12 @@ hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename)
}
if (device->hardware == OSTC4) {
return hw_ostc3_device_fwupdate4 (abstract, filename);
return hw_ostc3_device_fwupdate4 (abstract, filename, forceUpdate);
} else {
if (forceUpdate) {
return DC_STATUS_INVALIDARGS;
}
return hw_ostc3_device_fwupdate3 (abstract, filename);
}
}