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

Implemented NVM interface API also for MD-UV3x0 targets

This commit is contained in:
Silvano Seva 2020-11-22 12:48:17 +01:00
parent 8ddebef197
commit e690a36dd1
4 changed files with 280 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -163,6 +163,7 @@ md390_def = def + stm32f405_def
mduv380_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDx.c',
'platform/drivers/keyboard/keyboard_MDx.c',
'platform/drivers/NVM/extFlash_MDx.c',
'platform/drivers/NVM/nvmem_MDUV3x0.c',
'platform/drivers/ADC/ADC1_MDx.c',
'platform/targets/MD-UV380/platform.c',
'openrtx/src/graphics/graphics_rgb565.c']

94
platform/drivers/NVM/nvmTypes_MDUV3x0.h Normal file
View File

@ -0,0 +1,94 @@
/***************************************************************************
* 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 <http://www.gnu.org/licenses/> *
***************************************************************************/
#ifndef NVMTYPES_MDUV3x0_H
#define NVMTYPES_MDUV3x0_H
#include <datatypes.h>
#include <stdint.h>
/**
* 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 */

113
platform/drivers/NVM/nvmem_MDUV3x0.c Normal file
View File

@ -0,0 +1,113 @@
/***************************************************************************
* 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 <http://www.gnu.org/licenses/> *
***************************************************************************/
#include <delays.h>
#include "nvmTypes_MDUV3x0.h"
#include "nvmem.h"
#include "extFlash_MDx.h"
/**
* \internal Utility function to convert 4 byte BCD values into a 32-bit
* unsigned integer ones.
*/
uint32_t _bcd2bin(uint32_t bcd)
{
return ((bcd >> 28) & 0x0F) * 10000000 +
((bcd >> 24) & 0x0F) * 1000000 +
((bcd >> 20) & 0x0F) * 100000 +
((bcd >> 16) & 0x0F) * 10000 +
((bcd >> 12) & 0x0F) * 1000 +
((bcd >> 8) & 0x0F) * 100 +
((bcd >> 4) & 0x0F) * 10 +
(bcd & 0x0F);
}
void nvm_init()
{
extFlash_init();
}
void nvm_terminate()
{
extFlash_terminate();
}
void nvm_readCalibData(void *buf)
{
extFlash_wakeup();
delayUs(5);
mduv3x0Calib_t *calib = ((mduv3x0Calib_t *) buf);
/* Common calibration data */
(void) extFlash_readSecurityRegister(0x1000, (&calib->vox1), 6);
/* UHF-band calibration data */
(void) extFlash_readSecurityRegister(0x1009, (&calib->uhfCal.freqAdjustMid), 1);
(void) extFlash_readSecurityRegister(0x1010, calib->uhfCal.txHighPower, 9);
(void) extFlash_readSecurityRegister(0x2090, calib->uhfCal.txMidPower, 9);
(void) extFlash_readSecurityRegister(0x1020, calib->uhfCal.txLowPower, 9);
(void) extFlash_readSecurityRegister(0x1030, calib->uhfCal.rxSensitivity, 9);
(void) extFlash_readSecurityRegister(0x1040, calib->uhfCal.openSql9, 9);
(void) extFlash_readSecurityRegister(0x1050, calib->uhfCal.closeSql9, 9);
(void) extFlash_readSecurityRegister(0x1070, calib->uhfCal.closeSql1, 9);
(void) extFlash_readSecurityRegister(0x1060, calib->uhfCal.openSql1, 9);
(void) extFlash_readSecurityRegister(0x1090, calib->uhfCal.ctcss67Hz, 9);
(void) extFlash_readSecurityRegister(0x10a0, calib->uhfCal.ctcss151Hz, 9);
(void) extFlash_readSecurityRegister(0x10b0, calib->uhfCal.ctcss151Hz, 9);
(void) extFlash_readSecurityRegister(0x10d0, calib->uhfCal.dcsMod1, 9);
(void) extFlash_readSecurityRegister(0x2030, calib->uhfCal.sendIrange, 9);
(void) extFlash_readSecurityRegister(0x2040, calib->uhfCal.sendQrange, 9);
(void) extFlash_readSecurityRegister(0x2070, calib->uhfCal.analogSendIrange, 9);
(void) extFlash_readSecurityRegister(0x2080, calib->uhfCal.analogSendQrange, 9);
uint32_t freqs[18];
(void) extFlash_readSecurityRegister(0x20b0, ((uint8_t *) &freqs), 72);
for(uint8_t i = 0; i < 9; i++)
{
calib->uhfCal.rxFreq[i] = ((freq_t) _bcd2bin(freqs[2*i]));
calib->uhfCal.txFreq[i] = ((freq_t) _bcd2bin(freqs[2*i+1]));
}
/* VHF-band calibration data */
(void) extFlash_readSecurityRegister(0x100c, (&calib->vhfCal.freqAdjustMid), 1);
(void) extFlash_readSecurityRegister(0x1019, calib->vhfCal.txHighPower, 5);
(void) extFlash_readSecurityRegister(0x2099, calib->vhfCal.txMidPower, 5);
(void) extFlash_readSecurityRegister(0x1029, calib->vhfCal.txLowPower, 5);
(void) extFlash_readSecurityRegister(0x1039, calib->vhfCal.rxSensitivity, 5);
(void) extFlash_readSecurityRegister(0x109b, calib->vhfCal.ctcss67Hz, 5);
(void) extFlash_readSecurityRegister(0x10ab, calib->vhfCal.ctcss151Hz, 5);
(void) extFlash_readSecurityRegister(0x10bb, calib->vhfCal.ctcss151Hz, 5);
(void) extFlash_readSecurityRegister(0x10db, calib->vhfCal.dcsMod1, 5);
(void) extFlash_readSecurityRegister(0x2039, calib->vhfCal.sendIrange, 5);
(void) extFlash_readSecurityRegister(0x2049, calib->vhfCal.sendQrange, 5);
(void) extFlash_readSecurityRegister(0x2079, calib->uhfCal.analogSendIrange, 5);
(void) extFlash_readSecurityRegister(0x2089, calib->vhfCal.analogSendQrange, 5);
(void) extFlash_readSecurityRegister(0x2000, ((uint8_t *) &freqs), 40);
extFlash_sleep();
for(uint8_t i = 0; i < 5; i++)
{
calib->vhfCal.rxFreq[i] = ((freq_t) _bcd2bin(freqs[2*i]));
calib->vhfCal.txFreq[i] = ((freq_t) _bcd2bin(freqs[2*i+1]));
}
}

72
tests/platform/printCalib_MDUV3x0.c Normal file
View File

@ -0,0 +1,72 @@
#include <stdio.h>
#include <stdint.h>
#include <sys/types.h>
#include "nvmem.h"
#include "nvmTypes_MDUV3x0.h"
#include "extFlash_MDx.h"
int main()
{
nvm_init();
while(1)
{
getchar();
uint8_t i;
mduv3x0Calib_t cal;
nvm_readCalibData(&cal);
printf("vox1: %03d\r\n", cal.vox1);
printf("vox10: %03d\r\n", cal.vox10);
printf("rxLowVoltage: %03d\r\n", cal.rxLowVoltage);
printf("rxFullVoltage: %03d\r\n", cal.rxFullVoltage);
printf("rssi1: %03d\r\n", cal.rssi1);
printf("rssi4: %03d\r\n", cal.rssi4);
puts("\r\nUHF band:\r");
printf("freqAdjustMid: %03d\r\n", cal.uhfCal.freqAdjustMid);
printf("\r\nrxFreq: "); for(i = 0; i < 9; i++) printf("%d ", cal.uhfCal.rxFreq[i]);
printf("\r\ntxFreq: "); for(i = 0; i < 9; i++) printf("%d ", cal.uhfCal.txFreq[i]);
printf("\r\ntxHighPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.txHighPower[i]);
printf("\r\ntxMidPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.txMidPower[i]);
printf("\r\ntxLowPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.txLowPower[i]);
printf("\r\nrxSensitivity: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.rxSensitivity[i]);
printf("\r\nopenSql9: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.openSql9[i]);
printf("\r\ncloseSql9: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.closeSql9[i]);
printf("\r\nopenSql1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.openSql1[i]);
printf("\r\ncloseSql1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.closeSql1[i]);
printf("\r\nctcss67Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.ctcss67Hz[i]);
printf("\r\nctcss151Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.ctcss151Hz[i]);
printf("\r\nctcss254Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.ctcss254Hz[i]);
printf("\r\ndcsMod1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.dcsMod1[i]);
printf("\r\nsendIrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.sendIrange[i]);
printf("\r\nsendQrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.sendQrange[i]);
printf("\r\nanalogSendIrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.analogSendIrange[i]);
printf("\r\nanalogSendQrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.uhfCal.analogSendQrange[i]);
puts("\r\nVHF band:\r");
printf("freqAdjustMid: %03d\r\n", cal.vhfCal.freqAdjustMid);
printf("\r\nrxFreq: "); for(i = 0; i < 9; i++) printf("%d ", cal.vhfCal.rxFreq[i]);
printf("\r\ntxFreq: "); for(i = 0; i < 9; i++) printf("%d ", cal.vhfCal.txFreq[i]);
printf("\r\ntxHighPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.txHighPower[i]);
printf("\r\ntxMidPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.txMidPower[i]);
printf("\r\ntxLowPower: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.txLowPower[i]);
printf("\r\nrxSensitivity: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.rxSensitivity[i]);
printf("\r\nopenSql9: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.openSql9[i]);
printf("\r\ncloseSql9: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.closeSql9[i]);
printf("\r\nopenSql1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.openSql1[i]);
printf("\r\ncloseSql1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.closeSql1[i]);
printf("\r\nctcss67Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.ctcss67Hz[i]);
printf("\r\nctcss151Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.ctcss151Hz[i]);
printf("\r\nctcss254Hz: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.ctcss254Hz[i]);
printf("\r\ndcsMod1: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.dcsMod1[i]);
printf("\r\nsendIrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.sendIrange[i]);
printf("\r\nsendQrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.sendQrange[i]);
printf("\r\nanalogSendIrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.analogSendIrange[i]);
printf("\r\nanalogSendQrange: "); for(i = 0; i < 9; i++) printf("%03d ", cal.vhfCal.analogSendQrange[i]);
}
return 0;
}