dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 17:46:14 +01:00
Code Releases Activity

Fix indentation and refactor for split class

Browse Source
This commit is contained in:
David Cutting 2020-06-11 13:24:00 -06:00
parent 49cd0a866c
commit cdfb37c8b5
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,12 @@
{
"files.associations": {
"array": "cpp",
"deque": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"string_view": "cpp",
"initializer_list": "cpp",
"cstdint": "cpp"
}
}

59
src/main.cpp
View File

@ -4,66 +4,63 @@
#define DCC_IRQ_MICROSECONDS 29 #define DCC_IRQ_MICROSECONDS 29
#if defined(ARDUINO_AVR_UNO) #define NUM_LOCOS 50
#define NUM_LOCOS_MAIN 20
#else
#define NUM_LOCOS_MAIN 50
#endif
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// Motor driver selection: // Motor driver selection:
// Comment out all but the two lines that you want to use // Comment out all but the two lines that you want to use
// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS_MAIN); // DCCMain* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS);
// DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); // DCCService* progTrack = DCC::Create_WSM_SAMCommandStation_Prog();
DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS_MAIN); // DCCMain* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS);
DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); // DCCService* progTrack = DCC::Create_Arduino_L298Shield_Prog();
// DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(NUM_LOCOS_MAIN); DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(NUM_LOCOS);
// DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog();
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
void waveform_IrqHandler() { void waveform_IrqHandler() {
mainTrack->interruptHandler(); mainTrack->interruptHandler();
progTrack->interruptHandler(); progTrack->interruptHandler();
} }
#if defined(ARDUINO_ARCH_SAMD) #if defined(ARDUINO_ARCH_SAMD)
void SERCOM4_Handler() void SERCOM4_Handler()
{ {
mainTrack->hdw.railcomSerial()->IrqHandler(); mainTrack->railcom.getSerial()->IrqHandler();
} }
#endif #endif
void setup() { void setup() {
mainTrack->hdw.setup(); mainTrack->hdw.setup();
progTrack->hdw.setup(); mainTrack->railcom.setup();
progTrack->hdw.setup();
// TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328 // TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328
// We will fire an interrupt every 29us to generate the signal on the track // We will fire an interrupt every 29us to generate the signal on the track
TimerA.initialize(); TimerA.initialize();
TimerA.setPeriod(DCC_IRQ_MICROSECONDS); TimerA.setPeriod(DCC_IRQ_MICROSECONDS);
TimerA.attachInterrupt(waveform_IrqHandler); TimerA.attachInterrupt(waveform_IrqHandler);
TimerA.start(); TimerA.start();
#if defined (ARDUINO_ARCH_SAMD) #if defined (ARDUINO_ARCH_SAMD)
CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface
Wire.begin(); // Needed for EEPROM to work Wire.begin(); // Needed for EEPROM to work
#elif defined(ARDUINO_ARCH_AVR) #elif defined(ARDUINO_ARCH_AVR)
CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface
#endif #endif
EEStore::init(); EEStore::init();
DCCEXParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces DCCEXParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces
CommManager::showInitInfo(); CommManager::showInitInfo();
} }
void loop() { void loop() {
CommManager::update(); CommManager::update();
mainTrack->loop(); mainTrack->loop();
progTrack->loop(); progTrack->loop();
} }