fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ttwrplus: Ignore revision from sa8x8-fw version 

The "revisions since last tag" version field is now accurately named and no longer checked. Extra parentheses also added to reduce compiler warnings.

Fix #217
This commit is contained in:
edgetriggered 2023-12-23 22:13:52 +02:00 committed by Silvano Seva
parent 0363825c1a
commit 2ce3f5e949
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/drivers/baseband/SA8x8.c
View File

@ -30,7 +30,6 @@
#define SA868FW_MAJOR 1 #define SA868FW_MAJOR 1
#define SA868FW_MINOR 3 #define SA868FW_MINOR 3
#define SA868FW_PATCH 0 #define SA868FW_PATCH 0
#define SA868FW_RELEASE 1
#if DT_NODE_HAS_STATUS(DT_ALIAS(radio), okay) #if DT_NODE_HAS_STATUS(DT_ALIAS(radio), okay)
@ -116,21 +115,21 @@ static inline bool checkFwVersion()
uint8_t major; uint8_t major;
uint8_t minor; uint8_t minor;
uint8_t patch; uint8_t patch;
uint8_t release; uint8_t revision;
const char *fwVersionStr = sa8x8_getFwVersion(); const char *fwVersionStr = sa8x8_getFwVersion();
sscanf(fwVersionStr, "sa8x8-fw/v%hhu.%hhu.%hhu.r%hhu", &major, &minor, sscanf(fwVersionStr, "sa8x8-fw/v%hhu.%hhu.%hhu.r%hhu", &major, &minor,
&patch, &release); &patch, &revision);
if((major > SA868FW_MAJOR) || if((major > SA868FW_MAJOR) ||
(major == SA868FW_MAJOR) && (minor > SA868FW_MINOR) || ((major == SA868FW_MAJOR) && (minor > SA868FW_MINOR)) ||
(major == SA868FW_MAJOR) && (minor == SA868FW_MINOR) && (patch > SA868FW_PATCH) || ((major == SA868FW_MAJOR) && (minor == SA868FW_MINOR) && (patch > SA868FW_PATCH)) ||
(major == SA868FW_MAJOR) && (minor == SA868FW_MINOR) && (patch == SA868FW_PATCH) && (release >= SA868FW_RELEASE)) ((major == SA868FW_MAJOR) && (minor == SA868FW_MINOR) && (patch == SA868FW_PATCH)))
{ {
return true; return true;
} }
// Major, minor, patch or release not matching. // Major, minor, or patch not matching.
printk("SA8x8: error, unsupported baseband firmware, please update!\n"); printk("SA8x8: error, unsupported baseband firmware, please update!\n");
return false; return false;
} }