Skip to content

Don't delete config if UniqueID was used for AVR's #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DocMoebiuz merged 5 commits into from
May 5, 2024
Merged

Don't delete config if UniqueID was used for AVR's #312

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8e0668
don save 0x00 to config, check for 0xFF before generating new serial
elral Jan 14, 2024
89312e0
fixed missing return parameter
elral Jan 14, 2024
ee4d6e0
do not check for 0xFF for generating serial number
elral Jan 17, 2024
bdef940
send kInfo on generating serial
elral Jan 17, 2024
c56df66
send kDebug instead of kInfo on generating serial
elral Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ bool readConfigLength()
uint16_t length = MFeeprom.get_length();
configLength = 0;

if (MFeeprom.read_byte(MEM_OFFSET_CONFIG) == 0xFF)
return false;
while (MFeeprom.read_byte(addreeprom++) != 0x00) {
configLength++;
if (addreeprom > length) {
Expand Down Expand Up @@ -588,6 +590,7 @@ void generateRandomSerial()
randomSerial >>= 4;
}
MFeeprom.write_block(MEM_OFFSET_SERIAL, serial, MEM_LEN_SERIAL);
cmdMessenger.sendCmd(kDebug, F("Serial number generated"));
}

#if defined(ARDUINO_ARCH_RP2040)
Expand Down Expand Up @@ -619,30 +622,35 @@ void generateSerial(bool force)
MFeeprom.read_block(MEM_OFFSET_SERIAL, serial, MEM_LEN_SERIAL);
return;
}
#if defined(ARDUINO_ARCH_RP2040)

// A uniqueID is already generated and saved to the eeprom
if (MFeeprom.read_byte(MEM_OFFSET_SERIAL) == 'I' && MFeeprom.read_byte(MEM_OFFSET_SERIAL + 1) == 'D') {
#if defined(ARDUINO_ARCH_AVR)
generateRandomSerial();
#elif defined(ARDUINO_ARCH_RP2040)
readUniqueSerial();
#endif
return;
}
#endif


// Coming here no UniqueID and no serial number is available, so it's the first start up of a board
#if defined(ARDUINO_ARCH_AVR)
// Generate a serial number for AVR's
// To have not always the same starting point for the random generator, millis() are
// used as starting point. It is very unlikely that the time between flashing the firmware
// and getting the command to send the info's to the connector is always the same.
// additional double check if it's really a new board, should reduce Jaimes problem
generateRandomSerial();
#elif defined(ARDUINO_ARCH_RP2040)
// Read the uniqueID for Pico's and use it as serial number
readUniqueSerial();
// mark this in the eeprom that a UniqueID is used on first start up for Pico's
MFeeprom.write_block(MEM_OFFSET_SERIAL, "ID", 2);
#endif
// Set first byte of config to 0x00 to ensure empty config on 1st start up
// Otherwise the complete length of the config will be send with 0xFF (empty EEPROM)
MFeeprom.write_byte(MEM_OFFSET_CONFIG, 0x00);
if (MFeeprom.read_byte(MEM_OFFSET_CONFIG) == 0xFF) {
MFeeprom.write_block(MEM_OFFSET_CONFIG, 0x00);
}
}

void OnGenNewSerial()
Expand Down