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

Merge branch 'master' of https://github.com/noisymime/speeduino

This commit is contained in:
Josh Stewart 2020-11-19 21:38:07 +11:00
parent fd9fa36c29 33485ae9e1
commit 04478caf79
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
speeduino/init.ino
View File

@ -43,18 +43,6 @@ void initialiseAll()
configPage9.intcan_available = 1; // device has internal canbus configPage9.intcan_available = 1; // device has internal canbus
//STM32 can not currently enabled //STM32 can not currently enabled
#endif #endif
#if defined(CORE_TEENSY35)
configPage9.intcan_available = 1; // device has internal canbus
//Teensy uses the Flexcan_T4 library to use the internal canbus
//enable local can interface
//setup can interface to 500k
//Can0.setTX(3);
//Can0.setRX(4);
Can0.begin();
Can0.setBaudRate(500000);
Can0.enableFIFO();
#endif
loadConfig(); loadConfig();
doUpdates(); //Check if any data items need updating (Occurs with firmware updates) doUpdates(); //Check if any data items need updating (Occurs with firmware updates)
@ -224,6 +212,16 @@ void initialiseAll()
//Setup the calibration tables //Setup the calibration tables
loadCalibration(); loadCalibration();
#if defined(CORE_TEENSY35)
configPage9.intcan_available = 1; // device has internal canbus
//Teensy uses the Flexcan_T4 library to use the internal canbus
//enable local can interface
//setup can interface to 500k
Can0.begin();
Can0.setBaudRate(500000);
Can0.enableFIFO();
#endif
//Set the pin mappings //Set the pin mappings
if((configPage2.pinMapping == 255) || (configPage2.pinMapping == 0)) //255 = EEPROM value in a blank AVR; 0 = EEPROM value in new FRAM if((configPage2.pinMapping == 255) || (configPage2.pinMapping == 0)) //255 = EEPROM value in a blank AVR; 0 = EEPROM value in new FRAM
{ {
@ -233,6 +231,12 @@ void initialiseAll()
} }
else { setPinMapping(configPage2.pinMapping); } else { setPinMapping(configPage2.pinMapping); }
//Note: This must come after the call to setPinMapping() or else pins 29 and 30 will become unusable as outputs. Workaround for: https://github.com/tonton81/FlexCAN_T4/issues/14
#if defined(CORE_TEENSY35)
Can0.setRX(DEF);
Can0.setTX(DEF);
#endif
//Need to check early on whether the coil charging is inverted. If this is not set straight away it can cause an unwanted spark at bootup //Need to check early on whether the coil charging is inverted. If this is not set straight away it can cause an unwanted spark at bootup
if(configPage4.IgInv == 1) { coilHIGH = LOW; coilLOW = HIGH; } if(configPage4.IgInv == 1) { coilHIGH = LOW; coilLOW = HIGH; }
else { coilHIGH = HIGH; coilLOW = LOW; } else { coilHIGH = HIGH; coilLOW = LOW; }