From 7e8a96000107c1b087ff46c49466e16f349fadef Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Sun, 10 Jul 2022 09:23:37 +0200 Subject: [PATCH] Fixed compiler warnings on MD-UV3x0 and MD-9600 targets --- openrtx/src/core/battery.c | 3 +-- openrtx/src/main.c | 5 +++++ platform/drivers/CPS/cps_io_native_MDUV3x0.c | 1 - platform/drivers/NVM/nvmem_MDUV3x0.c | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openrtx/src/core/battery.c b/openrtx/src/core/battery.c index 6bfbc4ae..df06d28d 100644 --- a/openrtx/src/core/battery.c +++ b/openrtx/src/core/battery.c @@ -36,8 +36,7 @@ static const uint16_t bat_v_max = 0x0819; // 8.10V static const uint16_t bat_v_min = 0x0AD4; // 10.83V static const uint16_t bat_v_max = 0x0C73; // 12.45V #elif defined BAT_NONE -static const uint16_t bat_v_min = 0; -static const uint16_t bat_v_max = 0; +// Nothing to do, just avoid arising the compiler error #else #error Please define a battery type into platform/targets/.../hwconfig.h #endif diff --git a/openrtx/src/main.c b/openrtx/src/main.c index 4715a2c1..28feb509 100644 --- a/openrtx/src/main.c +++ b/openrtx/src/main.c @@ -20,6 +20,11 @@ #include +#ifdef PLATFORM_MD9600 +#include +#include +#endif + #ifdef PLATFORM_LINUX #include #endif diff --git a/platform/drivers/CPS/cps_io_native_MDUV3x0.c b/platform/drivers/CPS/cps_io_native_MDUV3x0.c index dc9e2d7f..89e038ed 100644 --- a/platform/drivers/CPS/cps_io_native_MDUV3x0.c +++ b/platform/drivers/CPS/cps_io_native_MDUV3x0.c @@ -28,7 +28,6 @@ static const uint32_t zoneBaseAddr = 0x149E0; /**< Base address of zones */ static const uint32_t zoneExtBaseAddr = 0x31000; /**< Base address of zone extensions */ -static const uint32_t vfoChannelBaseAddr = 0x2EF00; /**< Base address of VFO channel */ static const uint32_t chDataBaseAddr = 0x110000; /**< Base address of channel data */ static const uint32_t contactBaseAddr = 0x140000; /**< Base address of contacts */ static const uint32_t maxNumChannels = 3000; /**< Maximum number of channels in memory */ diff --git a/platform/drivers/NVM/nvmem_MDUV3x0.c b/platform/drivers/NVM/nvmem_MDUV3x0.c index d80548ff..b321508c 100644 --- a/platform/drivers/NVM/nvmem_MDUV3x0.c +++ b/platform/drivers/NVM/nvmem_MDUV3x0.c @@ -170,6 +170,7 @@ int nvm_readSettings(settings_t *settings) int nvm_writeSettings(const settings_t *settings) { + (void) settings; // Disable settings write until DFU is implemented for flash backups return -1; }