diff --git a/platform/targets/DM-1801/hwconfig.h b/platform/targets/DM-1801/hwconfig.h index 887dd01f..edfe16a9 100644 --- a/platform/targets/DM-1801/hwconfig.h +++ b/platform/targets/DM-1801/hwconfig.h @@ -23,16 +23,6 @@ #include "MK22F51212.h" -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 470000000 - /* Screen dimensions */ #define SCREEN_WIDTH 128 #define SCREEN_HEIGHT 64 diff --git a/platform/targets/DM-1801/platform.c b/platform/targets/DM-1801/platform.c index 665f2a11..c8d8eded 100644 --- a/platform/targets/DM-1801/platform.c +++ b/platform/targets/DM-1801/platform.c @@ -69,12 +69,12 @@ void platform_init() memset(&calibration, 0x00, sizeof(gdxCalibration_t)); /* Initialise hardware information structure */ - hwInfo.uhf_maxFreq = FREQ_LIMIT_UHF_HI/1000000; - hwInfo.uhf_minFreq = FREQ_LIMIT_UHF_LO/1000000; - hwInfo.vhf_maxFreq = FREQ_LIMIT_VHF_HI/1000000; - hwInfo.vhf_minFreq = FREQ_LIMIT_VHF_LO/1000000; - hwInfo.uhf_band = 1; - hwInfo.vhf_band = 1; + hwInfo.vhf_maxFreq = 174; + hwInfo.vhf_minFreq = 136; + hwInfo.vhf_band = 1; + hwInfo.uhf_maxFreq = 470; + hwInfo.uhf_minFreq = 400; + hwInfo.uhf_band = 1; hwInfo.lcd_type = 0; memcpy(hwInfo.name, "DM-1801", 7); hwInfo.name[7] = '\0'; diff --git a/platform/targets/GD-77/hwconfig.h b/platform/targets/GD-77/hwconfig.h index 751415c8..5160285d 100644 --- a/platform/targets/GD-77/hwconfig.h +++ b/platform/targets/GD-77/hwconfig.h @@ -23,16 +23,6 @@ #include "MK22F51212.h" -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 470000000 - /* Screen dimensions */ #define SCREEN_WIDTH 128 #define SCREEN_HEIGHT 64 diff --git a/platform/targets/GD-77/platform.c b/platform/targets/GD-77/platform.c index 8ffe9567..08d930aa 100644 --- a/platform/targets/GD-77/platform.c +++ b/platform/targets/GD-77/platform.c @@ -68,12 +68,12 @@ void platform_init() memset(&calibration, 0x00, sizeof(gdxCalibration_t)); /* Initialise hardware information structure */ - hwInfo.uhf_maxFreq = FREQ_LIMIT_UHF_HI/1000000; - hwInfo.uhf_minFreq = FREQ_LIMIT_UHF_LO/1000000; - hwInfo.vhf_maxFreq = FREQ_LIMIT_VHF_HI/1000000; - hwInfo.vhf_minFreq = FREQ_LIMIT_VHF_LO/1000000; - hwInfo.uhf_band = 1; + hwInfo.vhf_maxFreq = 174; + hwInfo.vhf_minFreq = 136; hwInfo.vhf_band = 1; + hwInfo.uhf_maxFreq = 470; + hwInfo.uhf_minFreq = 400; + hwInfo.uhf_band = 1; hwInfo.lcd_type = 0; memcpy(hwInfo.name, "GD-77", 5); hwInfo.name[5] = '\0'; diff --git a/platform/targets/MD-3x0/hwconfig.h b/platform/targets/MD-3x0/hwconfig.h index 2f04fbee..be49ee6f 100644 --- a/platform/targets/MD-3x0/hwconfig.h +++ b/platform/targets/MD-3x0/hwconfig.h @@ -31,16 +31,6 @@ /* Device has a channel selection knob */ #define HAS_ABSOLUTE_KNOB -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 480000000 - /* Screen dimensions */ #define SCREEN_WIDTH 160 #define SCREEN_HEIGHT 128 diff --git a/platform/targets/MD-9600/hwconfig.h b/platform/targets/MD-9600/hwconfig.h index d312fcfb..8f7f22a7 100644 --- a/platform/targets/MD-9600/hwconfig.h +++ b/platform/targets/MD-9600/hwconfig.h @@ -29,16 +29,6 @@ /* Device supports an optional GPS chip */ #define HAS_GPS -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 480000000 - /* Screen dimensions */ #define SCREEN_WIDTH 128 #define SCREEN_HEIGHT 64 diff --git a/platform/targets/MD-9600/platform.c b/platform/targets/MD-9600/platform.c index 322b02f6..7d5832bd 100644 --- a/platform/targets/MD-9600/platform.c +++ b/platform/targets/MD-9600/platform.c @@ -61,14 +61,14 @@ void platform_init() spi2_init(); - /* TODO temporary initialisation */ + /* TODO: Hardcode hwInfo until we implement reading from flash */ memset(&hwInfo, 0x00, sizeof(hwInfo)); - hwInfo.uhf_maxFreq = FREQ_LIMIT_UHF_HI/1000000; - hwInfo.uhf_minFreq = FREQ_LIMIT_UHF_LO/1000000; - hwInfo.vhf_maxFreq = FREQ_LIMIT_VHF_HI/1000000; - hwInfo.vhf_minFreq = FREQ_LIMIT_VHF_LO/1000000; - hwInfo.uhf_band = 1; + hwInfo.vhf_maxFreq = 174; + hwInfo.vhf_minFreq = 136; hwInfo.vhf_band = 1; + hwInfo.uhf_maxFreq = 480; + hwInfo.uhf_minFreq = 400; + hwInfo.uhf_band = 1; hwInfo.lcd_type = 0; memcpy(hwInfo.name, "MD-9600", 7); hwInfo.name[8] = '\0'; diff --git a/platform/targets/MD-UV3x0/hwconfig.h b/platform/targets/MD-UV3x0/hwconfig.h index 542e3c8b..06236d10 100644 --- a/platform/targets/MD-UV3x0/hwconfig.h +++ b/platform/targets/MD-UV3x0/hwconfig.h @@ -28,16 +28,6 @@ /* Device supports an optional GPS chip */ #define HAS_GPS -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 480000000 - /* Screen dimensions */ #define SCREEN_WIDTH 160 #define SCREEN_HEIGHT 128 diff --git a/platform/targets/linux/hwconfig.h b/platform/targets/linux/hwconfig.h index 2606a012..e534589e 100644 --- a/platform/targets/linux/hwconfig.h +++ b/platform/targets/linux/hwconfig.h @@ -24,16 +24,6 @@ /* Device supports an optional GPS chip */ #define HAS_GPS -/* Supported radio bands */ -#define BAND_VHF -#define BAND_UHF - -/* Band limits in Hz */ -#define FREQ_LIMIT_VHF_LO 136000000 -#define FREQ_LIMIT_VHF_HI 174000000 -#define FREQ_LIMIT_UHF_LO 400000000 -#define FREQ_LIMIT_UHF_HI 480000000 - /* Battery type */ #define BAT_LIPO_2S