mirror of
https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git
synced 2025-02-04 18:38:13 +00:00
Fix AFHDS2A
Fix bind issue with AFHDS2A Add frskyd hub telemetry voltage 2 from external battery Removed cflie warnings...
This commit is contained in:
Pascal Langer
parent
dde5f6e119
commit
f9f265271a
@ -81,6 +81,7 @@ enum{
|
||||
AFHDS2A_SENSOR_RX_RSSI = 0xfc,
|
||||
AFHDS2A_SENSOR_RX_NOISE = 0xfb,
|
||||
AFHDS2A_SENSOR_RX_SNR = 0xfa,
|
||||
AFHDS2A_SENSOR_A3_VOLTAGE = 0x03,
|
||||
};
|
||||
|
||||
static void AFHDS2A_update_telemetry()
|
||||
@ -111,6 +112,10 @@ static void AFHDS2A_update_telemetry()
|
||||
v_lipo1 = packet[index+2];
|
||||
telemetry_link=1;
|
||||
break;
|
||||
case AFHDS2A_SENSOR_A3_VOLTAGE:
|
||||
v_lipo2 = (packet[index+3]<<5) | (packet[index+2]>>3); // allows to read voltage up to 4S
|
||||
telemetry_link=1;
|
||||
break;
|
||||
case AFHDS2A_SENSOR_RX_ERR_RATE:
|
||||
RX_LQI=packet[index+2];
|
||||
break;
|
||||
@ -244,12 +249,17 @@ uint16_t ReadAFHDS2A()
|
||||
if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5 | 1<<6)))
|
||||
{ // FECF+CRCF Ok
|
||||
A7105_ReadData(AFHDS2A_RXPACKET_SIZE);
|
||||
if(packet[0] == 0xbc)
|
||||
if(packet[0] == 0xbc && packet[9] == 0x01)
|
||||
{
|
||||
uint8_t temp=AFHDS2A_EEPROM_OFFSET+RX_num*4;
|
||||
for(uint8_t i=0; i<4; i++)
|
||||
{
|
||||
rx_id[i] = packet[5+i];
|
||||
if(packet[9] == 0x01)
|
||||
eeprom_write_byte((EE_ADDR)(temp+i),rx_id[i]);
|
||||
}
|
||||
phase = AFHDS2A_BIND4;
|
||||
packet_count++;
|
||||
return 3850;
|
||||
}
|
||||
}
|
||||
packet_count++;
|
||||
@ -278,9 +288,6 @@ uint16_t ReadAFHDS2A()
|
||||
bind_phase++;
|
||||
if(bind_phase>=4)
|
||||
{
|
||||
uint8_t eeadr=AFHDS2A_EEPROM_OFFSET+RX_num*4;
|
||||
for(uint8_t i=0; i<4; i++)
|
||||
eeprom_write_byte((EE_ADDR)(eeadr+i),rx_id[i]);
|
||||
hopping_frequency_no=1;
|
||||
phase = AFHDS2A_DATA_INIT;
|
||||
BIND_DONE;
|
||||
@ -289,6 +296,7 @@ uint16_t ReadAFHDS2A()
|
||||
case AFHDS2A_DATA_INIT:
|
||||
packet_counter=0;
|
||||
packet_type = AFHDS2A_PACKET_STICKS;
|
||||
phase = AFHDS2A_DATA;
|
||||
case AFHDS2A_DATA:
|
||||
AFHDS2A_build_packet(packet_type);
|
||||
if((A7105_ReadReg(A7105_00_MODE) & 0x01)) // Check if something has been received...
|
||||
|
||||
@ -105,14 +105,13 @@ static inline uint8_t crtp_create_header(uint8_t port, uint8_t channel)
|
||||
// supports a total of 12 channels. R,P,Y,T leaves 8 aux channels left
|
||||
#define MAX_CPPM_AUX_CHANNELS 8
|
||||
|
||||
static uint8_t tx_payload_len = 0; // Length of the packet stored in tx_packet
|
||||
static uint8_t tx_packet[MAX_PACKET_SIZE]; // For writing Tx payloads
|
||||
static uint8_t tx_payload_len = 0; // Length of the packet stored in packet
|
||||
static uint8_t rx_payload_len = 0; // Length of the packet stored in rx_packet
|
||||
static uint8_t rx_packet[MAX_PACKET_SIZE]; // For reading in ACK payloads
|
||||
|
||||
static uint16_t cflie_counter;
|
||||
static uint32_t packet_counter;
|
||||
static uint8_t tx_power, data_rate, rf_channel;
|
||||
static uint8_t data_rate;
|
||||
|
||||
enum {
|
||||
CFLIE_INIT_SEARCH = 0,
|
||||
@ -183,7 +182,7 @@ enum {
|
||||
#define PACKET_CHKTIME 500 // time to wait if packet not yet acknowledged or timed out
|
||||
|
||||
// Helper for sending a packet
|
||||
// Assumes packet data has been put in tx_packet
|
||||
// Assumes packet data has been put in packet
|
||||
// and tx_payload_len has been set correctly
|
||||
static void send_packet()
|
||||
{
|
||||
@ -193,35 +192,28 @@ static void send_packet()
|
||||
NRF24L01_FlushRx();
|
||||
|
||||
// Transmit the payload
|
||||
NRF24L01_WritePayload(tx_packet, tx_payload_len);
|
||||
NRF24L01_WritePayload(packet, tx_payload_len);
|
||||
|
||||
++packet_counter;
|
||||
|
||||
// // Check and adjust transmission power. We do this after
|
||||
// // transmission to not bother with timeout after power
|
||||
// // settings change - we have plenty of time until next
|
||||
// // packet.
|
||||
// if (tx_power != Model.tx_power) {
|
||||
// //Keep transmit power updated
|
||||
// tx_power = Model.tx_power;
|
||||
// NRF24L01_SetPower(tx_power);
|
||||
// }
|
||||
NRF24L01_SetPower(); // hack? not sure if required...
|
||||
// // Check and adjust transmission power.
|
||||
NRF24L01_SetPower();
|
||||
}
|
||||
|
||||
static uint16_t dbg_cnt = 0;
|
||||
static uint8_t packet_ack()
|
||||
{
|
||||
if (++dbg_cnt > 50) {
|
||||
if (++dbg_cnt > 50)
|
||||
{
|
||||
// debugln("S: %02x\n", NRF24L01_ReadReg(NRF24L01_07_STATUS));
|
||||
dbg_cnt = 0;
|
||||
}
|
||||
switch (NRF24L01_ReadReg(NRF24L01_07_STATUS) & (BV(NRF24L01_07_TX_DS) | BV(NRF24L01_07_MAX_RT))) {
|
||||
switch (NRF24L01_ReadReg(NRF24L01_07_STATUS) & (BV(NRF24L01_07_TX_DS) | BV(NRF24L01_07_MAX_RT)))
|
||||
{
|
||||
case BV(NRF24L01_07_TX_DS):
|
||||
rx_payload_len = NRF24L01_GetDynamicPayloadSize();
|
||||
if (rx_payload_len > MAX_PACKET_SIZE) {
|
||||
if (rx_payload_len > MAX_PACKET_SIZE)
|
||||
rx_payload_len = MAX_PACKET_SIZE;
|
||||
}
|
||||
NRF24L01_ReadPayload(rx_packet, rx_payload_len);
|
||||
return PKT_ACKED;
|
||||
case BV(NRF24L01_07_MAX_RT):
|
||||
@ -244,9 +236,11 @@ static void send_search_packet()
|
||||
NRF24L01_WriteReg(NRF24L01_07_STATUS, (BV(NRF24L01_07_TX_DS) | BV(NRF24L01_07_MAX_RT)));
|
||||
NRF24L01_FlushTx();
|
||||
|
||||
if (rf_channel++ > 125) {
|
||||
rf_channel = 0;
|
||||
switch(data_rate) {
|
||||
if (rf_ch_num++ > 125)
|
||||
{
|
||||
rf_ch_num = 0;
|
||||
switch(data_rate)
|
||||
{
|
||||
case NRF24L01_BR_250K:
|
||||
data_rate = NRF24L01_BR_1M;
|
||||
break;
|
||||
@ -258,8 +252,7 @@ static void send_search_packet()
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
set_rate_channel(data_rate, rf_channel);
|
||||
set_rate_channel(data_rate, rf_ch_num);
|
||||
|
||||
NRF24L01_WritePayload(buf, sizeof(buf));
|
||||
|
||||
@ -273,7 +266,8 @@ static void send_search_packet()
|
||||
// Convert fractional 16.16 to float32
|
||||
static void frac2float(int32_t n, float* res)
|
||||
{
|
||||
if (n == 0) {
|
||||
if (n == 0)
|
||||
{
|
||||
*res = 0.0;
|
||||
return;
|
||||
}
|
||||
@ -360,13 +354,13 @@ static void send_crtp_rpyt_packet()
|
||||
// }
|
||||
|
||||
// Construct and send packet
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_SETPOINT, 0); // Commander packet to channel 0
|
||||
memcpy(&tx_packet[1], (char*) &cpkt, sizeof(cpkt));
|
||||
packet[0] = crtp_create_header(CRTP_PORT_SETPOINT, 0); // Commander packet to channel 0
|
||||
memcpy(&packet[1], (char*) &cpkt, sizeof(cpkt));
|
||||
tx_payload_len = 1 + sizeof(cpkt);
|
||||
send_packet();
|
||||
}
|
||||
|
||||
static void send_crtp_cppm_emu_packet()
|
||||
/*static void send_crtp_cppm_emu_packet()
|
||||
{
|
||||
struct CommanderPacketCppmEmu {
|
||||
struct {
|
||||
@ -413,14 +407,14 @@ static void send_crtp_cppm_emu_packet()
|
||||
uint8_t commanderPacketSize = 1 + 8 + (2*numAuxChannels);
|
||||
|
||||
// Construct and send packet
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_SETPOINT_GENERIC, 0); // Generic setpoint packet to channel 0
|
||||
tx_packet[1] = CRTP_SETPOINT_GENERIC_CPPM_EMU_TYPE;
|
||||
packet[0] = crtp_create_header(CRTP_PORT_SETPOINT_GENERIC, 0); // Generic setpoint packet to channel 0
|
||||
packet[1] = CRTP_SETPOINT_GENERIC_CPPM_EMU_TYPE;
|
||||
|
||||
// Copy the header (1) plus 4 2-byte channels (8) plus whatever number of 2-byte aux channels are in use
|
||||
memcpy(&tx_packet[2], (char*)&cpkt, commanderPacketSize); // Why not use sizeof(cpkt) here??
|
||||
memcpy(&packet[2], (char*)&cpkt, commanderPacketSize); // Why not use sizeof(cpkt) here??
|
||||
tx_payload_len = 2 + commanderPacketSize; // CRTP header, commander type, and packet
|
||||
send_packet();
|
||||
}
|
||||
}*/
|
||||
|
||||
static void send_cmd_packet()
|
||||
{
|
||||
@ -473,8 +467,8 @@ static uint8_t crtp_log_setup_state_machine()
|
||||
// fallthrough
|
||||
case CFLIE_CRTP_LOG_SETUP_STATE_SEND_CMD_GET_INFO:
|
||||
crtp_log_setup_state = CFLIE_CRTP_LOG_SETUP_STATE_ACK_CMD_GET_INFO;
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_TOC);
|
||||
tx_packet[1] = CRTP_LOG_TOC_CMD_INFO;
|
||||
packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_TOC);
|
||||
packet[1] = CRTP_LOG_TOC_CMD_INFO;
|
||||
tx_payload_len = 2;
|
||||
send_packet();
|
||||
break;
|
||||
@ -506,9 +500,9 @@ static uint8_t crtp_log_setup_state_machine()
|
||||
|
||||
case CFLIE_CRTP_LOG_SETUP_STATE_SEND_CMD_GET_ITEM:
|
||||
crtp_log_setup_state = CFLIE_CRTP_LOG_SETUP_STATE_ACK_CMD_GET_ITEM;
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_TOC);
|
||||
tx_packet[1] = CRTP_LOG_TOC_CMD_ELEMENT;
|
||||
tx_packet[2] = next_toc_variable;
|
||||
packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_TOC);
|
||||
packet[1] = CRTP_LOG_TOC_CMD_ELEMENT;
|
||||
packet[2] = next_toc_variable;
|
||||
tx_payload_len = 3;
|
||||
send_packet();
|
||||
break;
|
||||
@ -577,15 +571,15 @@ static uint8_t crtp_log_setup_state_machine()
|
||||
|
||||
case CFLIE_CRTP_LOG_SETUP_STATE_SEND_CONTROL_CREATE_BLOCK:
|
||||
crtp_log_setup_state = CFLIE_CRTP_LOG_SETUP_STATE_ACK_CONTROL_CREATE_BLOCK;
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_SETTINGS);
|
||||
tx_packet[1] = CRTP_LOG_SETTINGS_CMD_CREATE_BLOCK;
|
||||
tx_packet[2] = CFLIE_TELEM_LOG_BLOCK_ID; // Log block ID
|
||||
tx_packet[3] = vbat_var_type; // Variable type
|
||||
tx_packet[4] = vbat_var_id; // ID of the VBAT variable
|
||||
tx_packet[5] = extvbat_var_type; // Variable type
|
||||
tx_packet[6] = extvbat_var_id; // ID of the ExtVBat variable
|
||||
tx_packet[7] = rssi_var_type; // Variable type
|
||||
tx_packet[8] = rssi_var_id; // ID of the RSSI variable
|
||||
packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_SETTINGS);
|
||||
packet[1] = CRTP_LOG_SETTINGS_CMD_CREATE_BLOCK;
|
||||
packet[2] = CFLIE_TELEM_LOG_BLOCK_ID; // Log block ID
|
||||
packet[3] = vbat_var_type; // Variable type
|
||||
packet[4] = vbat_var_id; // ID of the VBAT variable
|
||||
packet[5] = extvbat_var_type; // Variable type
|
||||
packet[6] = extvbat_var_id; // ID of the ExtVBat variable
|
||||
packet[7] = rssi_var_type; // Variable type
|
||||
packet[8] = rssi_var_id; // ID of the RSSI variable
|
||||
tx_payload_len = 9;
|
||||
send_packet();
|
||||
break;
|
||||
@ -615,10 +609,10 @@ static uint8_t crtp_log_setup_state_machine()
|
||||
|
||||
case CFLIE_CRTP_LOG_SETUP_STATE_SEND_CONTROL_START_BLOCK:
|
||||
crtp_log_setup_state = CFLIE_CRTP_LOG_SETUP_STATE_ACK_CONTROL_START_BLOCK;
|
||||
tx_packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_SETTINGS);
|
||||
tx_packet[1] = CRTP_LOG_SETTINGS_CMD_START_LOGGING;
|
||||
tx_packet[2] = CFLIE_TELEM_LOG_BLOCK_ID; // Log block ID 1
|
||||
tx_packet[3] = CFLIE_TELEM_LOG_BLOCK_PERIOD_10MS; // Log frequency in 10ms units
|
||||
packet[0] = crtp_create_header(CRTP_PORT_LOG, CRTP_LOG_CHAN_SETTINGS);
|
||||
packet[1] = CRTP_LOG_SETTINGS_CMD_START_LOGGING;
|
||||
packet[2] = CFLIE_TELEM_LOG_BLOCK_ID; // Log block ID 1
|
||||
packet[3] = CFLIE_TELEM_LOG_BLOCK_PERIOD_10MS; // Log frequency in 10ms units
|
||||
tx_payload_len = 4;
|
||||
send_packet();
|
||||
break;
|
||||
@ -667,7 +661,7 @@ static int cflie_init()
|
||||
NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, TX_ADDR_SIZE-2); // 5-byte RX/TX address
|
||||
NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x13); // 3 retransmits, 500us delay
|
||||
|
||||
NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_channel); // Defined in initialize_rx_tx_addr
|
||||
NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num); // Defined in initialize_rx_tx_addr
|
||||
NRF24L01_SetBitrate(data_rate); // Defined in initialize_rx_tx_addr
|
||||
|
||||
NRF24L01_SetPower();
|
||||
@ -684,43 +678,6 @@ static int cflie_init()
|
||||
NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x01); // Enable Dynamic Payload Length on pipe 0
|
||||
NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x06); // Enable Dynamic Payload Length, enable Payload with ACK
|
||||
|
||||
// Check for Beken BK2421/BK2423 chip
|
||||
// It is done by using Beken specific activate code, 0x53
|
||||
// and checking that status register changed appropriately
|
||||
// There is no harm to run it on nRF24L01 because following
|
||||
// closing activate command changes state back even if it
|
||||
// does something on nRF24L01
|
||||
NRF24L01_Activate(0x53); // magic for BK2421 bank switch
|
||||
// debugln("CFlie: Trying to switch banks\n");
|
||||
if (NRF24L01_ReadReg(NRF24L01_07_STATUS) & 0x80) {
|
||||
// debugln("CFlie: BK2421 detected\n");
|
||||
long nul = 0;
|
||||
// Beken registers don't have such nice names, so we just mention
|
||||
// them by their numbers
|
||||
// It's all magic, eavesdropped from real transfer and not even from the
|
||||
// data sheet - it has slightly different values
|
||||
NRF24L01_WriteRegisterMulti(0x00, (uint8_t *) "\x40\x4B\x01\xE2", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x01, (uint8_t *) "\xC0\x4B\x00\x00", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x02, (uint8_t *) "\xD0\xFC\x8C\x02", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x03, (uint8_t *) "\xF9\x00\x39\x21", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x04, (uint8_t *) "\xC1\x96\x9A\x1B", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x05, (uint8_t *) "\x24\x06\x7F\xA6", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x06, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x07, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x08, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x09, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x0A, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x0B, (uint8_t *) &nul, 4);
|
||||
NRF24L01_WriteRegisterMulti(0x0C, (uint8_t *) "\x00\x12\x73\x00", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x0D, (uint8_t *) "\x46\xB4\x80\x00", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x0E, (uint8_t *) "\x41\x10\x04\x82\x20\x08\x08\xF2\x7D\xEF\xFF", 11);
|
||||
NRF24L01_WriteRegisterMulti(0x04, (uint8_t *) "\xC7\x96\x9A\x1B", 4);
|
||||
NRF24L01_WriteRegisterMulti(0x04, (uint8_t *) "\xC1\x96\x9A\x1B", 4);
|
||||
} else {
|
||||
// debugln("CFlie: nRF24L01 detected");
|
||||
}
|
||||
NRF24L01_Activate(0x53); // switch bank back
|
||||
|
||||
// 50ms delay in callback
|
||||
return 50000;
|
||||
}
|
||||
@ -734,7 +691,7 @@ static int cflie_init()
|
||||
|
||||
// // Read and reset count of dropped packets
|
||||
// frameloss += NRF24L01_ReadReg(NRF24L01_08_OBSERVE_TX) >> 4;
|
||||
// NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_channel); // reset packet loss counter
|
||||
// NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num); // reset packet loss counter
|
||||
// Telemetry.value[TELEM_DSM_FLOG_FRAMELOSS] = frameloss;
|
||||
// TELEMETRY_SetUpdated(TELEM_DSM_FLOG_FRAMELOSS);
|
||||
|
||||
@ -774,7 +731,7 @@ static int cflie_init()
|
||||
|
||||
// // Read and reset count of dropped packets
|
||||
// frameloss += NRF24L01_ReadReg(NRF24L01_08_OBSERVE_TX) >> 4;
|
||||
// NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_channel); // reset packet loss counter
|
||||
// NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num); // reset packet loss counter
|
||||
// Telemetry.value[TELEM_DSM_FLOG_FRAMELOSS] = frameloss;
|
||||
// TELEMETRY_SetUpdated(TELEM_DSM_FLOG_FRAMELOSS);
|
||||
|
||||
@ -854,7 +811,7 @@ static uint8_t initialize_rx_tx_addr()
|
||||
rx_tx_addr[4] = 0xE7; // CFlie uses fixed address
|
||||
|
||||
// if (Model.fixed_id) {
|
||||
// rf_channel = Model.fixed_id % 100;
|
||||
// rf_ch_num = Model.fixed_id % 100;
|
||||
// switch (Model.fixed_id / 100) {
|
||||
// case 0:
|
||||
// data_rate = NRF24L01_BR_250K;
|
||||
@ -876,17 +833,17 @@ static uint8_t initialize_rx_tx_addr()
|
||||
// }
|
||||
// } else {
|
||||
// data_rate = NRF24L01_BR_250K;
|
||||
// rf_channel = 10;
|
||||
// rf_ch_num = 10;
|
||||
// return CFLIE_INIT_SEARCH;
|
||||
// }
|
||||
|
||||
// Default 1
|
||||
data_rate = NRF24L01_BR_1M;
|
||||
rf_channel = 10;
|
||||
rf_ch_num = 10;
|
||||
|
||||
// Default 2
|
||||
// data_rate = NRF24L01_BR_2M;
|
||||
// rf_channel = 110;
|
||||
// rf_ch_num = 110;
|
||||
return CFLIE_INIT_SEARCH;
|
||||
}
|
||||
|
||||
|
||||
@ -1191,6 +1191,13 @@ void update_serial_data()
|
||||
{
|
||||
RX_DONOTUPDATE_on;
|
||||
RX_FLAG_off; //data is being processed
|
||||
#ifdef SAMSON // Extremely dangerous, do not enable this unless you know what you are doing...
|
||||
if( rx_ok_buff[0]==0x55 && (rx_ok_buff[1]&0x1F)==PROTO_FRSKYD && rx_ok_buff[2]==0x7F && rx_ok_buff[24]==217 && rx_ok_buff[25]==202 )
|
||||
{//proto==FRSKYD+sub==7+rx_num==7+CH15==73%+CH16==73%
|
||||
rx_ok_buff[1]=(rx_ok_buff[1]&0xE0) | PROTO_FLYSKY; // change the protocol to Flysky
|
||||
memcpy((void*)(rx_ok_buff+4),(void*)(rx_ok_buff+4+11),11); // reassign channels 9-16 to 1-8
|
||||
}
|
||||
#endif
|
||||
if(rx_ok_buff[1]&0x20) //check range
|
||||
RANGE_FLAG_on;
|
||||
else
|
||||
@ -1573,18 +1580,17 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
|
||||
// Generate a random ID
|
||||
#if defined STM32_BOARD
|
||||
#define STM32_UUID ((uint32_t *)0x1FFFF7E8)
|
||||
if (!create_new) {
|
||||
if (!create_new)
|
||||
{
|
||||
id = STM32_UUID[0] ^ STM32_UUID[1] ^ STM32_UUID[2];
|
||||
debugln("Generated ID from STM32 UUID");
|
||||
|
||||
} else
|
||||
}
|
||||
else
|
||||
#endif
|
||||
id = random(0xfefefefe) + ((uint32_t)random(0xfefefefe) << 16);
|
||||
|
||||
for(uint8_t i=0;i<4;i++)
|
||||
{
|
||||
eeprom_write_byte((EE_ADDR)address+i,id >> (i*8));
|
||||
}
|
||||
eeprom_write_byte((EE_ADDR)(address+10),0xf0);//write bind flag in eeprom.
|
||||
return id;
|
||||
#else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user