noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Serial begin statements until after config is loaded

This commit is contained in:
Josh Stewart 2017-02-02 17:45:41 +11:00
parent dd92c40af4
commit 76b6e26aca
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
speeduino.ino
View File

@ -131,10 +131,6 @@ volatile bool fpPrimed = false; //Tracks whether or not the fuel pump priming ha
void setup() void setup()
{ {
Serial.begin(115200);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) //ATmega2561 does not have Serial3
if (configPage1.canEnable) { Serial3.begin(115200); }
#endif
//Setup the dummy fuel and ignition tables //Setup the dummy fuel and ignition tables
//dummyFuelTable(&fuelTable); //dummyFuelTable(&fuelTable);
@ -151,6 +147,11 @@ void setup()
loadConfig(); loadConfig();
Serial.begin(115200);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) //ATmega2561 does not have Serial3
if (configPage1.canEnable) { Serial3.begin(115200); }
#endif
//Repoint the 2D table structs to the config pages that were just loaded //Repoint the 2D table structs to the config pages that were just loaded
taeTable.valueSize = SIZE_BYTE; //Set this table to use byte values taeTable.valueSize = SIZE_BYTE; //Set this table to use byte values
taeTable.xSize = 4; taeTable.xSize = 4;

2
utils.ino
View File

@ -371,6 +371,8 @@ void setPinMapping(byte boardID)
pinMode(pinFan, OUTPUT); pinMode(pinFan, OUTPUT);
pinMode(pinStepperDir, OUTPUT); pinMode(pinStepperDir, OUTPUT);
pinMode(pinStepperStep, OUTPUT); pinMode(pinStepperStep, OUTPUT);
pinMode(pinBoost, OUTPUT);
pinMode(pinVVT_1, OUTPUT);
inj1_pin_port = portOutputRegister(digitalPinToPort(pinInjector1)); inj1_pin_port = portOutputRegister(digitalPinToPort(pinInjector1));
inj1_pin_mask = digitalPinToBitMask(pinInjector1); inj1_pin_mask = digitalPinToBitMask(pinInjector1);