Skip to content

MF type to flash, simplier check for serial avail. #217

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 4 commits into from
Dec 8, 2022
Merged

MF type to flash, simplier check for serial avail. #217

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cdffd5
MF type to flash, simplier check for serial avail.
elral Oct 24, 2022
e2fb468
write a const instead of a defined 1byte array
elral Oct 24, 2022
d404e55
change command defintion from char to uint8_t
elral Dec 6, 2022
124bb9b
Merge branch 'MobiFlight:main' into RAM_savings
elral Dec 8, 2022
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
46 changes: 21 additions & 25 deletions src/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ const uint8_t MEM_OFFSET_SERIAL = MEM_OFFSET_NAME + MEM_LEN_NAME;
const uint8_t MEM_LEN_SERIAL = 11;
const uint8_t MEM_OFFSET_CONFIG = MEM_OFFSET_NAME + MEM_LEN_NAME + MEM_LEN_SERIAL;

const char type[sizeof(MOBIFLIGHT_TYPE)] = MOBIFLIGHT_TYPE;
char serial[MEM_LEN_SERIAL] = MOBIFLIGHT_SERIAL;
char name[MEM_LEN_NAME] = MOBIFLIGHT_NAME;
const int MEM_LEN_CONFIG = MEMLEN_CONFIG;
char nameBuffer[MEM_LEN_CONFIG] = "";
uint16_t configLength = 0;
boolean configActivated = false;
char serial[MEM_LEN_SERIAL] = MOBIFLIGHT_SERIAL;
char name[MEM_LEN_NAME] = MOBIFLIGHT_NAME;
const int MEM_LEN_CONFIG = MEMLEN_CONFIG;
char nameBuffer[MEM_LEN_CONFIG] = "";
uint16_t configLength = 0;
boolean configActivated = false;

void resetConfig();
void readConfig();
Expand Down Expand Up @@ -164,17 +163,17 @@ void OnResetConfig()
void OnSaveConfig()
{
cmdMessenger.sendCmd(kConfigSaved, F("OK"));
// Uncomment the if{} part to reset and load the config via serial terminal for testing w/o the GUI
// 1: Type "13" to reset the config
// 2: Type "14" to get the config length
// 3: Type "16" to load the config
/*
if (readConfigLength())
{
readConfig();
_activateConfig();
}
*/
// Uncomment the if{} part to reset and load the config via serial terminal for testing w/o the GUI
// 1: Type "13" to reset the config
// 2: Type "14" to get the config length
// 3: Type "16" to load the config
/*
if (readConfigLength())
{
readConfig();
_activateConfig();
}
*/
}

void OnActivateConfig()
Expand Down Expand Up @@ -237,7 +236,7 @@ void readConfig()
uint16_t addreeprom = MEM_OFFSET_CONFIG; // define first memory location where config is saved in EEPROM
uint16_t addrbuffer = 0; // and start with first memory location from nameBuffer
char params[6] = "";
char command = readUintFromEEPROM(&addreeprom); // read the first value from EEPROM, it's a device definition
uint8_t command = readUintFromEEPROM(&addreeprom); // read the first value from EEPROM, it's a device definition
bool copy_success = true; // will be set to false if copying input names to nameBuffer exceeds array dimensions
// not required anymore when pins instead of names are transferred to the UI

Expand Down Expand Up @@ -422,7 +421,7 @@ void OnGetInfo()
{
setLastCommandMillis();
cmdMessenger.sendCmdStart(kInfo);
cmdMessenger.sendCmdArg(type);
cmdMessenger.sendCmdArg(F(MOBIFLIGHT_TYPE));
cmdMessenger.sendCmdArg(name);
cmdMessenger.sendCmdArg(serial);
cmdMessenger.sendCmdArg(VERSION);
Expand Down Expand Up @@ -462,16 +461,13 @@ void OnGenNewSerial()
// ************************************************************
void storeName()
{
char prefix[] = "#";
MFeeprom.write_block(MEM_OFFSET_NAME, prefix, 1);
MFeeprom.write_byte(MEM_OFFSET_NAME, '#');
MFeeprom.write_block(MEM_OFFSET_NAME + 1, name, MEM_LEN_NAME - 1);
}

void restoreName()
{
char testHasName[1] = "";
MFeeprom.read_block(MEM_OFFSET_NAME, testHasName, 1);
if (testHasName[0] != '#')
if (MFeeprom.read_char(MEM_OFFSET_NAME) != '#')
return;

MFeeprom.read_block(MEM_OFFSET_NAME + 1, name, MEM_LEN_NAME - 1);
Expand Down