dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-23 08:06:13 +01:00
Code Releases Activity

More main file cleanup to reflect library changes

Browse Source
This commit is contained in:
David Cutting 2020-05-30 15:47:12 -06:00
parent 1dd214931f
commit ea3153279b
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.cpp
View File

@ -4,16 +4,6 @@
#define DCC_IRQ_MICROSECONDS 29 #define DCC_IRQ_MICROSECONDS 29
#if defined(ARDUINO_ARCH_SAMD)
Uart mainRailcomUART(&sercom2, 5, 2, SERCOM_RX_PAD_3, UART_TX_PAD_2);
void SERCOM2_Handler()
{
mainRailcomUART.IrqHandler();
}
#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
@ -29,11 +19,18 @@ DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2);
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
void main_IrqHandler() { void waveform_IrqHandler() {
mainTrack->interruptHandler(); mainTrack->interruptHandler();
progTrack->interruptHandler(); progTrack->interruptHandler();
} }
#if defined(ARDUINO_ARCH_SAMD)
void SERCOM2_Handler()
{
mainTrack->hdw.railcom_serial->IrqHandler();
}
#endif
void setup() { void setup() {
mainTrack->hdw.init(); mainTrack->hdw.init();
progTrack->hdw.init(); progTrack->hdw.init();
@ -42,11 +39,9 @@ void setup() {
// We will fire an interrupt every 58us to generate the signal on the track // We will fire an interrupt every 58us to generate the signal on the track
TimerA.initialize(); TimerA.initialize();
TimerA.setPeriod(DCC_IRQ_MICROSECONDS); TimerA.setPeriod(DCC_IRQ_MICROSECONDS);
TimerA.attachInterrupt(main_IrqHandler); TimerA.attachInterrupt(waveform_IrqHandler);
TimerA.start(); TimerA.start();
mainRailcomUART.begin(250000);
#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