g4klx/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM_HS.git synced 2025-12-06 07:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

UDID is now optional (disabled in some boards to save flash memory)

Browse source
This commit is contained in:
Andy CA6JAU 2019-12-01 21:20:26 -03:00
parent 146e6fb3e6
commit 1210748cdb
19 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Config.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

4
SerialPort.cpp
View file

@ -78,7 +78,9 @@ const uint8_t MMDVM_DEBUG5 = 0xF5U;
const uint8_t PROTOCOL_VERSION = 1U; const uint8_t PROTOCOL_VERSION = 1U;
#if defined(ENABLE_UDID)
char UDID[] = "00000000000000000000000000000000"; char UDID[] = "00000000000000000000000000000000";
#endif
CSerialPort::CSerialPort() : CSerialPort::CSerialPort() :
m_buffer(), m_buffer(),
@ -211,9 +213,11 @@ void CSerialPort::getVersion()
for (uint8_t i = 0U; HARDWARE[i] != 0x00U; i++, count++) for (uint8_t i = 0U; HARDWARE[i] != 0x00U; i++, count++)
reply[count] = HARDWARE[i]; reply[count] = HARDWARE[i];
#if defined(ENABLE_UDID)
reply[count++] = '\0'; reply[count++] = '\0';
for (uint8_t i = 0U; UDID[i] != 0x00U; i++, count++) for (uint8_t i = 0U; UDID[i] != 0x00U; i++, count++)
reply[count] = UDID[i]; reply[count] = UDID[i];
#endif
reply[1U] = count; reply[1U] = count;

4
SerialSTM.cpp
View file

@ -433,13 +433,16 @@ void WriteUSART2(const uint8_t* data, uint16_t length)
#endif #endif
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
#if defined(ENABLE_UDID)
extern char UDID[]; extern char UDID[];
extern "C" { extern "C" {
#include <stdio.h> #include <stdio.h>
} }
#endif
void CSerialPort::beginInt(uint8_t n, int speed) void CSerialPort::beginInt(uint8_t n, int speed)
{ {
#if defined(ENABLE_UDID)
#if defined(STM32F4XX) #if defined(STM32F4XX)
uint32_t *id0 = (uint32_t *) (0x1FFF7A10); uint32_t *id0 = (uint32_t *) (0x1FFF7A10);
uint32_t *id1 = (uint32_t *) (0x1FFF7A10 + 0x04); uint32_t *id1 = (uint32_t *) (0x1FFF7A10 + 0x04);
@ -458,6 +461,7 @@ void CSerialPort::beginInt(uint8_t n, int speed)
uint32_t *id1 = (uint32_t *) (0x1FFFF7E8 + 0x04); uint32_t *id1 = (uint32_t *) (0x1FFFF7E8 + 0x04);
uint32_t *id2 = (uint32_t *) (0x1FFFF7E8 + 0x08); uint32_t *id2 = (uint32_t *) (0x1FFFF7E8 + 0x08);
::sprintf(UDID, "%04X%04X%08X%08X", *id00, *id01, *(unsigned int *)id1, *(unsigned int *)id2); ::sprintf(UDID, "%04X%04X%08X%08X", *id00, *id01, *(unsigned int *)id1, *(unsigned int *)id2);
#endif
#endif #endif
switch (n) { switch (n) {

3
configs/D2RG_MMDVM_HS.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/MMDVM_HS_Dual_Hat-12mhz.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/MMDVM_HS_Dual_Hat.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/MMDVM_HS_Hat-12mhz.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/MMDVM_HS_Hat.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/NanoDV_NPI.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/NanoDV_USB.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/Nano_hotSPOT.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/ZUMspot_Libre.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/ZUMspot_RPi.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/ZUMspot_USB.h
View file

@ -107,4 +107,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/ZUMspot_dualband.h
View file

@ -106,4 +106,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/ZUMspot_duplex.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/generic_duplex_gpio.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif

3
configs/generic_duplex_usb.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
// #define ENABLE_UDID
#endif #endif

3
configs/generic_gpio.h
View file

@ -108,4 +108,7 @@
// Disable frequency restrictions (satellite, ISS, etc) // Disable frequency restrictions (satellite, ISS, etc)
// #define DISABLE_FREQ_BAN // #define DISABLE_FREQ_BAN
// Enable UDID feature
#define ENABLE_UDID
#endif #endif