dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-25 05:31:24 +01:00
Code Releases Activity

optimize for loops for size (and speed)

Browse Source
This commit is contained in:
Harald Barth 2021-08-01 15:07:06 +02:00
parent 55b7091d5a
commit c4f659243e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Outputs.cpp
View File

@ -138,15 +138,18 @@ void Output::load(){
// id. If someone uses only pins 0 to 7 of their arduino, they // id. If someone uses only pins 0 to 7 of their arduino, they
// loose. This is (if you look at an arduino) however unlikely. // loose. This is (if you look at an arduino) however unlikely.
for(uint16_t i=0;i<EEStore::eeStore->data.nOutputs;i++){ uint16_t i=EEStore::eeStore->data.nOutputs;
while(i--){
EEPROM.get(EEStore::pointer()+ i*sizeof(struct BrokenOutputData),bdata); EEPROM.get(EEStore::pointer()+ i*sizeof(struct BrokenOutputData),bdata);
if (bdata.iFlag > 7) { // it's a pin and not an iFlag! if (bdata.iFlag > 7) { // it's a pin and not an iFlag!
isBroken=0; isBroken=0;
break; break;
} }
} }
i=EEStore::eeStore->data.nOutputs;
if ( isBroken ) { if ( isBroken ) {
for(uint16_t i=0;i<EEStore::eeStore->data.nOutputs;i++){ while(i--){
EEPROM.get(EEStore::pointer(),bdata); EEPROM.get(EEStore::pointer(),bdata);
tt=create(bdata.id,bdata.pin,bdata.iFlag); tt=create(bdata.id,bdata.pin,bdata.iFlag);
tt->data.oStatus=bitRead(tt->data.iFlag,1)?bitRead(tt->data.iFlag,2):bdata.oStatus; // restore status to EEPROM value is bit 1 of iFlag=0, otherwise set to value of bit 2 of iFlag tt->data.oStatus=bitRead(tt->data.iFlag,1)?bitRead(tt->data.iFlag,2):bdata.oStatus; // restore status to EEPROM value is bit 1 of iFlag=0, otherwise set to value of bit 2 of iFlag
@ -158,7 +161,7 @@ void Output::load(){
} else { } else {
struct OutputData data; struct OutputData data;
for(uint16_t i=0;i<EEStore::eeStore->data.nOutputs;i++){ while(i--){
EEPROM.get(EEStore::pointer(),data); EEPROM.get(EEStore::pointer(),data);
tt=create(data.id,data.pin,data.iFlag); tt=create(data.id,data.pin,data.iFlag);
tt->data.oStatus=bitRead(tt->data.iFlag,1)?bitRead(tt->data.iFlag,2):data.oStatus; // restore status to EEPROM value is bit 1 of iFlag=0, otherwise set to value of bit 2 of iFlag tt->data.oStatus=bitRead(tt->data.iFlag,1)?bitRead(tt->data.iFlag,2):data.oStatus; // restore status to EEPROM value is bit 1 of iFlag=0, otherwise set to value of bit 2 of iFlag

3
Sensors.cpp
View File

@ -184,7 +184,8 @@ void Sensor::load(){
struct SensorData data; struct SensorData data;
Sensor *tt; Sensor *tt;
for(uint16_t i=0;i<EEStore::eeStore->data.nSensors;i++){ uint16_t i=EEStore::eeStore->data.nSensors;
while(i--){
EEPROM.get(EEStore::pointer(),data); EEPROM.get(EEStore::pointer(),data);
tt=create(data.snum,data.pin,data.pullUp); tt=create(data.snum,data.pin,data.pullUp);
EEStore::advance(sizeof(tt->data)); EEStore::advance(sizeof(tt->data));

3
Turnouts.cpp
View File

@ -103,7 +103,8 @@ void Turnout::load(){
struct TurnoutData data; struct TurnoutData data;
Turnout *tt; Turnout *tt;
for(uint16_t i=0;i<EEStore::eeStore->data.nTurnouts;i++){ uint16_t i=EEStore::eeStore->data.nTurnouts;
while(i--){
EEPROM.get(EEStore::pointer(),data); EEPROM.get(EEStore::pointer(),data);
if (data.tStatus & STATUS_PWM) tt=create(data.id,data.tStatus & STATUS_PWMPIN, data.inactiveAngle,data.moveAngle); if (data.tStatus & STATUS_PWM) tt=create(data.id,data.tStatus & STATUS_PWMPIN, data.inactiveAngle,data.moveAngle);
else tt=create(data.id,data.address,data.subAddress); else tt=create(data.id,data.address,data.subAddress);