Merge pull request #3 from yyyc514/optimize_unitname

optimize the unit name code (-136 bytes)
This commit is contained in:
Scott Allen 2017-04-13 16:29:10 -04:00 committed by GitHub
commit 358f21ae4e
1 changed files with 8 additions and 11 deletions

View File

@ -995,12 +995,12 @@ uint8_t Arduboy2Base::readUnitName(char* name)
for (dest = 0; dest < ARDUBOY_UNIT_NAME_LEN; dest++) for (dest = 0; dest < ARDUBOY_UNIT_NAME_LEN; dest++)
{ {
if ((val = EEPROM.read(src)) == 0x00 || (byte)val == 0xFF) val = EEPROM.read(src);
{
break;
}
name[dest] = val; name[dest] = val;
src++; src++;
if (val == 0x00 || (byte)val == 0xFF) {
break;
}
} }
name[dest] = 0x00; name[dest] = 0x00;
@ -1014,17 +1014,14 @@ void Arduboy2Base::writeUnitName(char* name)
for (uint8_t src = 0; src < ARDUBOY_UNIT_NAME_LEN; src++) for (uint8_t src = 0; src < ARDUBOY_UNIT_NAME_LEN; src++)
{ {
if (name[src] != 0x00 && !done) if (name[src] == 0x00) {
{
EEPROM.update(dest, name[src]);
}
else
{
done = true; done = true;
EEPROM.update(dest, 0x00);
} }
// write character or 0 pad if finished
EEPROM.update(dest, done ? 0x00 : name[src]);
dest++; dest++;
} }
} }
bool Arduboy2Base::readShowUnitNameFlag() bool Arduboy2Base::readShowUnitNameFlag()