diff --git a/platform/drivers/NVM/nvmTypes_MD3x0.h b/platform/drivers/NVM/nvmTypes_MD3x0.h deleted file mode 100644 index d8b30ee0..00000000 --- a/platform/drivers/NVM/nvmTypes_MD3x0.h +++ /dev/null @@ -1,76 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2020 by Federico Amedeo Izzo IU2NUO, * - * Niccolò Izzo IU2KIN * - * Frederik Saraci IU2NRO * - * Silvano Seva IU2KWO * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, see * - ***************************************************************************/ - -#ifndef NVMTYPES_MD3x0_H -#define NVMTYPES_MD3x0_H - -#include -#include - -/** - * Data types defining the structure of data stored in external flash memory of - * MD3x0 devices. - */ - -/** - * \brief Calibration data for MD-3x0. - */ -typedef struct -{ - uint8_t vox1; - uint8_t vox10; - uint8_t rxLowVoltage; - uint8_t rxFullVoltage; - uint8_t rssi1; - uint8_t rssi4; - uint8_t analogMic; - uint8_t digitalMic; - uint8_t freqAdjustHigh; - uint8_t freqAdjustMid; - uint8_t freqAdjustLow; - freq_t rxFreq[9]; - freq_t txFreq[9]; - uint8_t txHighPower[9]; - uint8_t txLowPower[9]; - uint8_t rxSensitivity[9]; - uint8_t openSql9[9]; - uint8_t closeSql9[9]; - uint8_t openSql1[9]; - uint8_t closeSql1[9]; - uint8_t maxVolume[9]; - uint8_t ctcss67Hz[9]; - uint8_t ctcss151Hz[9]; - uint8_t ctcss254Hz[9]; - uint8_t dcsMod2[9]; - uint8_t dcsMod1[9]; - uint8_t mod1Partial[9]; - uint8_t analogVoiceAdjust[9]; - uint8_t lockVoltagePartial[9]; - uint8_t sendIpartial[9]; - uint8_t sendQpartial[9]; - uint8_t sendIrange[9]; - uint8_t sendQrange[9]; - uint8_t rxIpartial[9]; - uint8_t rxQpartial[9]; - uint8_t analogSendIrange[9]; - uint8_t analogSendQrange[9]; -}md3x0Calib_t; - -#endif /* NVMTYPES_MD3x0_H */ diff --git a/platform/drivers/NVM/nvmTypes_MDUV3x0.h b/platform/drivers/NVM/nvmTypes_MDUV3x0.h deleted file mode 100644 index 6ae70e77..00000000 --- a/platform/drivers/NVM/nvmTypes_MDUV3x0.h +++ /dev/null @@ -1,94 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2020 by Federico Amedeo Izzo IU2NUO, * - * Niccolò Izzo IU2KIN * - * Frederik Saraci IU2NRO * - * Silvano Seva IU2KWO * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, see * - ***************************************************************************/ - -#ifndef NVMTYPES_MDUV3x0_H -#define NVMTYPES_MDUV3x0_H - -#include -#include - -/** - * Data types defining the structure of data stored in external flash memory of - * MD-UV3x0 devices. - */ - -typedef struct -{ - uint8_t freqAdjustMid; - freq_t rxFreq[5]; - freq_t txFreq[5]; - uint8_t txHighPower[5]; - uint8_t txMidPower[5]; - uint8_t txLowPower[5]; - uint8_t rxSensitivity[5]; - uint8_t openSql9[5]; - uint8_t closeSql9[5]; - uint8_t openSql1[5]; - uint8_t closeSql1[5]; - uint8_t ctcss67Hz[5]; - uint8_t ctcss151Hz[5]; - uint8_t ctcss254Hz[5]; - uint8_t dcsMod1[5]; - uint8_t sendIrange[5]; - uint8_t sendQrange[5]; - uint8_t analogSendIrange[5]; - uint8_t analogSendQrange[5]; -}VhfCalib_t; - -typedef struct -{ - uint8_t freqAdjustMid; - freq_t rxFreq[9]; - freq_t txFreq[9]; - uint8_t txHighPower[9]; - uint8_t txMidPower[9]; - uint8_t txLowPower[9]; - uint8_t rxSensitivity[9]; - uint8_t openSql9[9]; - uint8_t closeSql9[9]; - uint8_t openSql1[9]; - uint8_t closeSql1[9]; - uint8_t ctcss67Hz[9]; - uint8_t ctcss151Hz[9]; - uint8_t ctcss254Hz[9]; - uint8_t dcsMod1[9]; - uint8_t sendIrange[9]; - uint8_t sendQrange[9]; - uint8_t analogSendIrange[9]; - uint8_t analogSendQrange[9]; -}UhfCalib_t; - -/** - * \brief Calibration data for MD-UV3x0. - */ -typedef struct -{ - uint8_t vox1; - uint8_t vox10; - uint8_t rxLowVoltage; - uint8_t rxFullVoltage; - uint8_t rssi1; - uint8_t rssi4; - VhfCalib_t vhfCal; - UhfCalib_t uhfCal; - -}mduv3x0Calib_t; - -#endif /* NVMTYPES_MDUV3x0_H */ diff --git a/platform/drivers/NVM/nvmem_MD3x0.c b/platform/drivers/NVM/nvmem_MD3x0.c index 86fe7084..01088b81 100644 --- a/platform/drivers/NVM/nvmem_MD3x0.c +++ b/platform/drivers/NVM/nvmem_MD3x0.c @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include "nvmem.h" -#include "extFlash_MDx.h" -#include +#include #include +#include "extFlash_MDx.h" +#include "calibInfo_MDx.h" /** * \internal Utility function to convert 4 byte BCD values into a 32-bit diff --git a/platform/drivers/NVM/nvmem_MDUV3x0.c b/platform/drivers/NVM/nvmem_MDUV3x0.c index d2f14f38..6ce2dd6c 100644 --- a/platform/drivers/NVM/nvmem_MDUV3x0.c +++ b/platform/drivers/NVM/nvmem_MDUV3x0.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ +#include #include -#include "nvmTypes_MDUV3x0.h" -#include "nvmem.h" +#include "calibInfo_MDx.h" #include "extFlash_MDx.h" /** diff --git a/tests/platform/printCalib_MDx.c b/tests/platform/printCalib_MDx.c index 9667a71b..6bc78c95 100644 --- a/tests/platform/printCalib_MDx.c +++ b/tests/platform/printCalib_MDx.c @@ -21,10 +21,8 @@ #include #include #include -#include "nvmem.h" -#include "nvmTypes_MD3x0.h" -#include "nvmTypes_MDUV3x0.h" -#include "extFlash_MDx.h" +#include +#include void printMD3x0calibration() {