From a3a13967ecbe720f53aa4134c94566190eddd7b4 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Mon, 25 May 2020 01:43:34 -0600 Subject: [PATCH 01/32] Initial commit --- .gitattributes | 2 ++ .gitignore | 5 +++ .travis.yml | 67 +++++++++++++++++++++++++++++++++++++++++ .vscode/extensions.json | 7 +++++ include/README | 39 ++++++++++++++++++++++++ lib/README | 46 ++++++++++++++++++++++++++++ platformio.ini | 29 ++++++++++++++++++ src/main.cpp | 50 ++++++++++++++++++++++++++++++ test/README | 11 +++++++ 9 files changed, 256 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .travis.yml create mode 100644 .vscode/extensions.json create mode 100644 include/README create mode 100644 lib/README create mode 100644 platformio.ini create mode 100644 src/main.cpp create mode 100644 test/README diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7c486f1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,67 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# +# +# Please choose one of the following templates (proposed below) and uncomment +# it (remove "# " before each line) or use own configuration according to the +# Travis CI documentation (see above). +# + + +# +# Template #1: General project. Test it using existing `platformio.ini`. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio run + + +# +# Template #2: The project is intended to be used as a library with examples. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# env: +# - PLATFORMIO_CI_SRC=path/to/test/file.c +# - PLATFORMIO_CI_SRC=examples/file.ino +# - PLATFORMIO_CI_SRC=path/to/test/directory +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..e80666b --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/include/README b/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/lib/README b/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 0000000..89d476a --- /dev/null +++ b/platformio.ini @@ -0,0 +1,29 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:samd21] +platform = atmelsam +board = sparkfun_samd21_dev_usb +framework = arduino +lib_deps = + https://github.com/davidcutting42/CommandStation.git#master + https://github.com/davidcutting42/ArduinoTimers.git#master + SparkFun External EEPROM Arduino Library +build_flags = -D ATSAMD21G + +[env:mega2560] +platform = atmelavr +board = megaatmega2560 +framework = arduino +lib_deps = + https://github.com/davidcutting42/CommandStation.git#master + https://github.com/davidcutting42/ArduinoTimers.git#master + SparkFun External EEPROM Arduino Library +build_flags = -D ATMEGA2560 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..e6b333f --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,50 @@ +#include +#include + +DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); + +void main_IrqHandler() { + mainTrack->interrupt_handler(); +} + +void prog_IrqHandler() { + progTrack->interrupt_handler(); +} + +void setup() { +#if defined (ATSAMD21G) + CommManager::registerInterface(new SerialInterface(SerialUSB)); // Register SerialUSB as an interface + + TimerTCC0.initialize(); + TimerTCC0.setPeriod(58); + TimerTCC0.attachInterrupt(main_IrqHandler); + TimerTCC0.start(); + + TimerTCC1.initialize(); + TimerTCC1.setPeriod(58); + TimerTCC1.attachInterrupt(prog_IrqHandler); + TimerTCC1.start(); +#elif defined(ATMEGA2560) + CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface + + Timer1.initialize(); + Timer1.setPeriod(58); + Timer1.attachInterrupt(main_IrqHandler); + Timer1.start(); + + Timer3.initialize(); + Timer3.setPeriod(58); + Timer3.attachInterrupt(prog_IrqHandler); + Timer3.start(); +#endif + + StringParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces + CommManager::showInitInfo(); +} + +void loop() { + CommManager::update(); + mainTrack->check(); + progTrack->check(); +} \ No newline at end of file diff --git a/test/README b/test/README new file mode 100644 index 0000000..df5066e --- /dev/null +++ b/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html From c3fd15025ee301f4d15c7c99e510d49d1894d19a Mon Sep 17 00:00:00 2001 From: David Cutting Date: Mon, 25 May 2020 04:56:03 -0600 Subject: [PATCH 02/32] Move timers names to pointers in main file --- lib/README | 46 ---------------------------------------------- platformio.ini | 21 ++++++++++++++------- src/main.cpp | 19 ++++++++++--------- 3 files changed, 24 insertions(+), 62 deletions(-) delete mode 100644 lib/README diff --git a/lib/README b/lib/README deleted file mode 100644 index 6debab1..0000000 --- a/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/platformio.ini b/platformio.ini index 89d476a..9dfdf7a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,14 +8,23 @@ ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html -[env:samd21] -platform = atmelsam -board = sparkfun_samd21_dev_usb -framework = arduino +[platformio] +default_envs = mega2560 + +[env] lib_deps = https://github.com/davidcutting42/CommandStation.git#master https://github.com/davidcutting42/ArduinoTimers.git#master SparkFun External EEPROM Arduino Library + DIO2 + +[env:samd21] +platform = atmelsam +board = sparkfun_samd21_dev_usb +framework = arduino +upload_protocol = atmel-ice +lib_deps = + ${env.lib_deps} build_flags = -D ATSAMD21G [env:mega2560] @@ -23,7 +32,5 @@ platform = atmelavr board = megaatmega2560 framework = arduino lib_deps = - https://github.com/davidcutting42/CommandStation.git#master - https://github.com/davidcutting42/ArduinoTimers.git#master - SparkFun External EEPROM Arduino Library + ${env.lib_deps} build_flags = -D ATMEGA2560 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index e6b333f..07a01f1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,6 @@ #include #include +#include DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); @@ -14,17 +15,17 @@ void prog_IrqHandler() { void setup() { #if defined (ATSAMD21G) - CommManager::registerInterface(new SerialInterface(SerialUSB)); // Register SerialUSB as an interface + CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface - TimerTCC0.initialize(); - TimerTCC0.setPeriod(58); - TimerTCC0.attachInterrupt(main_IrqHandler); - TimerTCC0.start(); + mainTrack->int_timer->initialize(); + mainTrack->int_timer->setPeriod(58); + mainTrack->int_timer->attachInterrupt(main_IrqHandler); + mainTrack->int_timer->start(); - TimerTCC1.initialize(); - TimerTCC1.setPeriod(58); - TimerTCC1.attachInterrupt(prog_IrqHandler); - TimerTCC1.start(); + progTrack->int_timer->initialize(); + progTrack->int_timer->setPeriod(58); + progTrack->int_timer->attachInterrupt(prog_IrqHandler); + progTrack->int_timer->start(); #elif defined(ATMEGA2560) CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface From 7455a45f4d0e7655cf00a642d9835ae0bc7ff2ee Mon Sep 17 00:00:00 2001 From: David Cutting Date: Mon, 25 May 2020 17:21:21 -0600 Subject: [PATCH 03/32] Moved to single timer for both tracks using "stretched zero" trick --- platformio.ini | 2 +- src/main.cpp | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/platformio.ini b/platformio.ini index 9dfdf7a..6737792 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = mega2560 +default_envs = samd21, mega2560 [env] lib_deps = diff --git a/src/main.cpp b/src/main.cpp index 07a01f1..01ebd78 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,9 +7,6 @@ DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); void main_IrqHandler() { mainTrack->interrupt_handler(); -} - -void prog_IrqHandler() { progTrack->interrupt_handler(); } @@ -17,26 +14,16 @@ void setup() { #if defined (ATSAMD21G) CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface - mainTrack->int_timer->initialize(); - mainTrack->int_timer->setPeriod(58); - mainTrack->int_timer->attachInterrupt(main_IrqHandler); - mainTrack->int_timer->start(); - - progTrack->int_timer->initialize(); - progTrack->int_timer->setPeriod(58); - progTrack->int_timer->attachInterrupt(prog_IrqHandler); - progTrack->int_timer->start(); + TimerTCC0.initialize(); + TimerTCC0.setPeriod(58); + TimerTCC0.attachInterrupt(main_IrqHandler); + TimerTCC0.start(); #elif defined(ATMEGA2560) CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface - Timer1.initialize(); - Timer1.setPeriod(58); - Timer1.attachInterrupt(main_IrqHandler); - Timer1.start(); - Timer3.initialize(); Timer3.setPeriod(58); - Timer3.attachInterrupt(prog_IrqHandler); + Timer3.attachInterrupt(main_IrqHandler); Timer3.start(); #endif From 37824f586b0e0a574b76570cc12a5c256cdfccdf Mon Sep 17 00:00:00 2001 From: David Cutting Date: Tue, 26 May 2020 03:16:05 -0600 Subject: [PATCH 04/32] Select Pololu Motor shield --- include/README | 39 -------------------------------------- platformio.ini | 19 ++++++++++++++----- src/main.cpp | 51 +++++++++++++++++++++++++++++++------------------- test/README | 11 ----------- 4 files changed, 46 insertions(+), 74 deletions(-) delete mode 100644 include/README delete mode 100644 test/README diff --git a/include/README b/include/README deleted file mode 100644 index 194dcd4..0000000 --- a/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/platformio.ini b/platformio.ini index 6737792..49dd6ea 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,15 +9,13 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = samd21, mega2560 +default_envs = samd21 [env] lib_deps = https://github.com/davidcutting42/CommandStation.git#master https://github.com/davidcutting42/ArduinoTimers.git#master - SparkFun External EEPROM Arduino Library - DIO2 - + [env:samd21] platform = atmelsam board = sparkfun_samd21_dev_usb @@ -25,6 +23,7 @@ framework = arduino upload_protocol = atmel-ice lib_deps = ${env.lib_deps} + SparkFun External EEPROM Arduino Library build_flags = -D ATSAMD21G [env:mega2560] @@ -33,4 +32,14 @@ board = megaatmega2560 framework = arduino lib_deps = ${env.lib_deps} -build_flags = -D ATMEGA2560 \ No newline at end of file + DIO2 +build_flags = -D ATMEGA2560 + +[env:mega328] +platform = atmelavr +board = uno +framework = arduino +lib_deps = + ${env.lib_deps} + DIO2 +build_flags = -D ATMEGA328 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 01ebd78..663db8d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,37 +2,50 @@ #include #include -DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); -DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); +#define DCC_IRQ_MICROSECONDS 58 + +//////////////////////////////////////////////////////////////// +// Motor driver selection: +// Comment out all but the two lines that you want to use + +// ;DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +// DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); + +// DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); +// DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); + +DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(10); +DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); + +//////////////////////////////////////////////////////////////// void main_IrqHandler() { - mainTrack->interrupt_handler(); - progTrack->interrupt_handler(); + mainTrack->interruptHandler(); + progTrack->interruptHandler(); } void setup() { -#if defined (ATSAMD21G) - CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface - - TimerTCC0.initialize(); - TimerTCC0.setPeriod(58); - TimerTCC0.attachInterrupt(main_IrqHandler); - TimerTCC0.start(); -#elif defined(ATMEGA2560) - CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface + // TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328 + // We will fire an interrupt every 58us to generate the signal on the track + TimerA.initialize(); + TimerA.setPeriod(DCC_IRQ_MICROSECONDS); + TimerA.attachInterrupt(main_IrqHandler); + TimerA.start(); - Timer3.initialize(); - Timer3.setPeriod(58); - Timer3.attachInterrupt(main_IrqHandler); - Timer3.start(); +#if defined (ARDUINO_ARCH_SAMD) + CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface +#elif defined(ARDUINO_ARCH_AVR) + CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface #endif + //EEStore::init(); + StringParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces CommManager::showInitInfo(); } void loop() { CommManager::update(); - mainTrack->check(); - progTrack->check(); + mainTrack->loop(); + progTrack->loop(); } \ No newline at end of file diff --git a/test/README b/test/README deleted file mode 100644 index df5066e..0000000 --- a/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html From 9c66b0aea7c744bac0384d7ada7ffb958147ddd7 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Wed, 27 May 2020 22:56:29 -0600 Subject: [PATCH 05/32] Fix SAMD21 EEPROM and prepare for initial testing. --- platformio.ini | 2 +- src/main.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 49dd6ea..b133bed 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = samd21 +default_envs = samd21, mega2560, mega328 [env] lib_deps = diff --git a/src/main.cpp b/src/main.cpp index 663db8d..9a03cc4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,13 +8,13 @@ // Motor driver selection: // Comment out all but the two lines that you want to use -// ;DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); // DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); // DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); // DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); -DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(10); +DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(50); DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); //////////////////////////////////////////////////////////////// @@ -34,11 +34,12 @@ void setup() { #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface + Wire.begin(); // Needed for EEPROM to work #elif defined(ARDUINO_ARCH_AVR) CommManager::registerInterface(new SerialInterface(Serial)); // Register Serial (USB port on mega/uno) as an interface #endif - //EEStore::init(); + EEStore::init(); StringParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces CommManager::showInitInfo(); From a33270dff389abbc44dcb2d149779704a5630eb5 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 30 May 2020 03:03:19 -0600 Subject: [PATCH 06/32] Added railcom stuff --- src/main.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9a03cc4..7f5f6ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,20 +2,30 @@ #include #include -#define DCC_IRQ_MICROSECONDS 58 +#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: // Comment out all but the two lines that you want to use -// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); -// DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); +DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); // DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); // DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); -DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(50); -DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); +// DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(50); +// DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); //////////////////////////////////////////////////////////////// @@ -32,6 +42,8 @@ void setup() { TimerA.attachInterrupt(main_IrqHandler); TimerA.start(); + mainRailcomUART.begin(250000); + #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface Wire.begin(); // Needed for EEPROM to work @@ -49,4 +61,5 @@ void loop() { CommManager::update(); mainTrack->loop(); progTrack->loop(); -} \ No newline at end of file +} + From 1dd214931f0a4062bf55292f7e90b3c0ddde815d Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 30 May 2020 13:06:45 -0600 Subject: [PATCH 07/32] Update main file to reflect library changes --- src/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 7f5f6ae..4da0d75 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,6 +35,9 @@ void main_IrqHandler() { } void setup() { + mainTrack->hdw.init(); + progTrack->hdw.init(); + // TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328 // We will fire an interrupt every 58us to generate the signal on the track TimerA.initialize(); @@ -53,7 +56,7 @@ void setup() { EEStore::init(); - StringParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces + JMRIParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces CommManager::showInitInfo(); } From ea3153279bfa4292180962c7cce68dac19a78efa Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 30 May 2020 15:47:12 -0600 Subject: [PATCH 08/32] More main file cleanup to reflect library changes --- src/main.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4da0d75..604633b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,16 +4,6 @@ #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: // 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(); progTrack->interruptHandler(); } +#if defined(ARDUINO_ARCH_SAMD) +void SERCOM2_Handler() +{ + mainTrack->hdw.railcom_serial->IrqHandler(); +} +#endif + void setup() { mainTrack->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 TimerA.initialize(); TimerA.setPeriod(DCC_IRQ_MICROSECONDS); - TimerA.attachInterrupt(main_IrqHandler); + TimerA.attachInterrupt(waveform_IrqHandler); TimerA.start(); - mainRailcomUART.begin(250000); - #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface Wire.begin(); // Needed for EEPROM to work From 9f60df9f01afd11bfa9cfceb35eca329345b823d Mon Sep 17 00:00:00 2001 From: David Cutting Date: Mon, 1 Jun 2020 16:31:23 -0600 Subject: [PATCH 09/32] Remove build flags and switch back to SERCOM4 --- platformio.ini | 5 +---- src/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index b133bed..2fb4226 100644 --- a/platformio.ini +++ b/platformio.ini @@ -24,7 +24,6 @@ upload_protocol = atmel-ice lib_deps = ${env.lib_deps} SparkFun External EEPROM Arduino Library -build_flags = -D ATSAMD21G [env:mega2560] platform = atmelavr @@ -33,7 +32,6 @@ framework = arduino lib_deps = ${env.lib_deps} DIO2 -build_flags = -D ATMEGA2560 [env:mega328] platform = atmelavr @@ -41,5 +39,4 @@ board = uno framework = arduino lib_deps = ${env.lib_deps} - DIO2 -build_flags = -D ATMEGA328 \ No newline at end of file + DIO2 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 604633b..10584d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,7 +25,7 @@ void waveform_IrqHandler() { } #if defined(ARDUINO_ARCH_SAMD) -void SERCOM2_Handler() +void SERCOM4_Handler() { mainTrack->hdw.railcom_serial->IrqHandler(); } @@ -52,7 +52,7 @@ void setup() { EEStore::init(); JMRIParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces - CommManager::showInitInfo(); + CommManager::showInitInfo(); } void loop() { From 872ed372df4874d57764060badc59e218533f5cd Mon Sep 17 00:00:00 2001 From: David Cutting Date: Tue, 2 Jun 2020 13:46:37 -0600 Subject: [PATCH 10/32] More library changes. --- src/main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 10584d5..a7fefc8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,11 +8,11 @@ // Motor driver selection: // Comment out all but the two lines that you want to use -DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); -DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); +// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +// DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); -// DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); -// DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); +DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); +DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); // DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(50); // DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); @@ -27,16 +27,16 @@ void waveform_IrqHandler() { #if defined(ARDUINO_ARCH_SAMD) void SERCOM4_Handler() { - mainTrack->hdw.railcom_serial->IrqHandler(); + mainTrack->hdw.railcomSerial()->IrqHandler(); } #endif void setup() { - mainTrack->hdw.init(); - progTrack->hdw.init(); + mainTrack->hdw.setup(); + progTrack->hdw.setup(); // TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328 - // We will fire an interrupt every 58us to generate the signal on the track + // We will fire an interrupt every 29us to generate the signal on the track TimerA.initialize(); TimerA.setPeriod(DCC_IRQ_MICROSECONDS); TimerA.attachInterrupt(waveform_IrqHandler); From 4033b6a59727491150f5c3b7871cec24c6ed87c5 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Tue, 2 Jun 2020 16:37:58 -0600 Subject: [PATCH 11/32] Reduce locomotives when compiling for UNO --- src/main.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a7fefc8..9c079af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,17 +4,23 @@ #define DCC_IRQ_MICROSECONDS 29 +#if defined(ARDUINO_AVR_UNO) +#define NUM_LOCOS_MAIN 20 +#else +#define NUM_LOCOS_MAIN 50 +#endif + //////////////////////////////////////////////////////////////// // Motor driver selection: // Comment out all but the two lines that you want to use -// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(50); +// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS_MAIN); // DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); -DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(50); +DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS_MAIN); DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); -// DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(50); +// DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(NUM_LOCOS_MAIN); // DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); //////////////////////////////////////////////////////////////// @@ -34,7 +40,7 @@ void SERCOM4_Handler() void setup() { mainTrack->hdw.setup(); progTrack->hdw.setup(); - + // 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 TimerA.initialize(); From 49cd0a866c3a7894c8a4da46b5f3ee59f1487819 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Thu, 4 Jun 2020 12:45:49 -0600 Subject: [PATCH 12/32] Rename Parser --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 9c079af..805105a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,7 +57,7 @@ void setup() { EEStore::init(); - JMRIParser::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(); } From cdfb37c8b59d7c26a7db58267b068da9dc95e2bf Mon Sep 17 00:00:00 2001 From: David Cutting Date: Thu, 11 Jun 2020 13:24:00 -0600 Subject: [PATCH 13/32] Fix indentation and refactor for split class --- .vscode/settings.json | 12 +++++++++ src/main.cpp | 61 ++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1301145 --- /dev/null +++ b/.vscode/settings.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 805105a..c7c10f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,66 +4,63 @@ #define DCC_IRQ_MICROSECONDS 29 -#if defined(ARDUINO_AVR_UNO) -#define NUM_LOCOS_MAIN 20 -#else -#define NUM_LOCOS_MAIN 50 -#endif +#define NUM_LOCOS 50 //////////////////////////////////////////////////////////////// // Motor driver selection: // Comment out all but the two lines that you want to use -// DCC* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS_MAIN); -// DCC* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(2); +// DCCMain* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS); +// DCCService* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(); -DCC* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS_MAIN); -DCC* progTrack = DCC::Create_Arduino_L298Shield_Prog(2); - -// DCC* mainTrack = DCC::Create_Pololu_MC33926Shield_Main(NUM_LOCOS_MAIN); -// DCC* progTrack = DCC::Create_Pololu_MC33926Shield_Prog(2); +// DCCMain* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS); +// DCCService* progTrack = DCC::Create_Arduino_L298Shield_Prog(); + +DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(NUM_LOCOS); +DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); //////////////////////////////////////////////////////////////// void waveform_IrqHandler() { - mainTrack->interruptHandler(); - progTrack->interruptHandler(); + mainTrack->interruptHandler(); + progTrack->interruptHandler(); } #if defined(ARDUINO_ARCH_SAMD) void SERCOM4_Handler() { - mainTrack->hdw.railcomSerial()->IrqHandler(); + mainTrack->railcom.getSerial()->IrqHandler(); } #endif void setup() { - mainTrack->hdw.setup(); - progTrack->hdw.setup(); + mainTrack->hdw.setup(); + mainTrack->railcom.setup(); + progTrack->hdw.setup(); - // 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 - TimerA.initialize(); - TimerA.setPeriod(DCC_IRQ_MICROSECONDS); - TimerA.attachInterrupt(waveform_IrqHandler); - TimerA.start(); + // 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 + TimerA.initialize(); + TimerA.setPeriod(DCC_IRQ_MICROSECONDS); + TimerA.attachInterrupt(waveform_IrqHandler); + TimerA.start(); #if defined (ARDUINO_ARCH_SAMD) - CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface - Wire.begin(); // Needed for EEPROM to work + CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface + Wire.begin(); // Needed for EEPROM to work #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 - EEStore::init(); + EEStore::init(); - DCCEXParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces - CommManager::showInitInfo(); + DCCEXParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces + CommManager::showInitInfo(); } void loop() { - CommManager::update(); - mainTrack->loop(); - progTrack->loop(); + CommManager::update(); + mainTrack->loop(); + progTrack->loop(); } From 69a47d8559708b1974580aaf8e4cf2e8e28f7c9f Mon Sep 17 00:00:00 2001 From: David Cutting Date: Thu, 11 Jun 2020 19:30:45 -0600 Subject: [PATCH 14/32] Cleanup to reflect library changes, including splid Main/Service track. --- src/main.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c7c10f7..217381f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,21 +2,20 @@ #include #include -#define DCC_IRQ_MICROSECONDS 29 - -#define NUM_LOCOS 50 +const uint8_t kIRQmicros = 29; +const uint8_t kNumLocos = 50; //////////////////////////////////////////////////////////////// // Motor driver selection: // Comment out all but the two lines that you want to use -// DCCMain* mainTrack = DCC::Create_WSM_SAMCommandStation_Main(NUM_LOCOS); -// DCCService* progTrack = DCC::Create_WSM_SAMCommandStation_Prog(); +// DCCMain* mainTrack = DCCMain::Create_WSM_SAMCommandStation_Main(kNumLocos); +// DCCService* progTrack = DCCService::Create_WSM_SAMCommandStation_Prog(); -// DCCMain* mainTrack = DCC::Create_Arduino_L298Shield_Main(NUM_LOCOS); -// DCCService* progTrack = DCC::Create_Arduino_L298Shield_Prog(); +// DCCMain* mainTrack = DCCMain::Create_Arduino_L298Shield_Main(kNumLocos); +// DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); -DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(NUM_LOCOS); +DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(kNumLocos); DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); //////////////////////////////////////////////////////////////// @@ -34,27 +33,28 @@ void SERCOM4_Handler() #endif void setup() { - mainTrack->hdw.setup(); - mainTrack->railcom.setup(); - progTrack->hdw.setup(); + mainTrack->setup(); + progTrack->setup(); // 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 TimerA.initialize(); - TimerA.setPeriod(DCC_IRQ_MICROSECONDS); + TimerA.setPeriod(kIRQmicros); TimerA.attachInterrupt(waveform_IrqHandler); TimerA.start(); #if defined (ARDUINO_ARCH_SAMD) - CommManager::registerInterface(new USBInterface(SerialUSB)); // Register SerialUSB as an interface + CommManager::registerInterface(new USBInterface(SerialUSB)); Wire.begin(); // Needed for EEPROM to work #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)); #endif EEStore::init(); - DCCEXParser::init(mainTrack, progTrack); // Set up the string parser to accept commands from the interfaces + // Set up the string parser to accept commands from the interfaces + DCCEXParser::init(mainTrack, progTrack); + CommManager::showInitInfo(); } From 2e5e071fbb10cfd276e6cc8b9442486fcb5677af Mon Sep 17 00:00:00 2001 From: David Cutting Date: Fri, 12 Jun 2020 22:51:42 -0600 Subject: [PATCH 15/32] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 0bfeefca37ca135107be86dd21f2f284c8328aef Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sun, 28 Jun 2020 00:28:08 -0600 Subject: [PATCH 16/32] Change configuration, rename FireBox --- include/Config.h | 29 +++++++++++++++++++++++++++++ src/main.cpp | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 include/Config.h diff --git a/include/Config.h b/include/Config.h new file mode 100644 index 0000000..56ba0e7 --- /dev/null +++ b/include/Config.h @@ -0,0 +1,29 @@ +/* + * Config.h + * + * This file is part of CommandStation-DCC. + * + * CommandStation-DCC is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * CommandStation-DCC is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with CommandStation-DCC. If not, see . + */ + +#ifndef COMMANDSTATION_DCC_CONFIG +#define COMMANDSTATION_DCC_CONFIG + +// Choose the motor shield that you want to use. + +#define CONFIG_WSM_FIREBOX +//#define CONFIG_ARDUINO_MOTOR_SHIELD +//#define CONFIG_POLOLU_MOTOR_SHIELD + +#endif \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 217381f..6d7a079 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,24 +1,41 @@ +/* + * main.cpp + * + * This file is part of CommandStation-DCC. + * + * CommandStation-DCC is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * CommandStation-DCC is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with CommandStation-DCC. If not, see . + */ + #include #include #include +#include "Config.h" + const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; -//////////////////////////////////////////////////////////////// -// Motor driver selection: -// Comment out all but the two lines that you want to use - -// DCCMain* mainTrack = DCCMain::Create_WSM_SAMCommandStation_Main(kNumLocos); -// DCCService* progTrack = DCCService::Create_WSM_SAMCommandStation_Prog(); - -// DCCMain* mainTrack = DCCMain::Create_Arduino_L298Shield_Main(kNumLocos); -// DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); - +#if defined CONFIG_WSM_FIREBOX +DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_Main(kNumLocos); +DCCService* progTrack = DCCService::Create_WSM_FireBox_Prog(); +#elif defined CONFIG_ARDUINO_MOTOR_SHIELD +DCCMain* mainTrack = DCCMain::Create_Arduino_L298Shield_Main(kNumLocos); +DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); +#elif defined CONFIG_POLOLU_MOTOR_SHIELD DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(kNumLocos); DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); - -//////////////////////////////////////////////////////////////// +#endif void waveform_IrqHandler() { mainTrack->interruptHandler(); From 9c6ca904a077d6401fef98d38b5deb870fac1613 Mon Sep 17 00:00:00 2001 From: dexslab Date: Tue, 30 Jun 2020 22:50:47 -0400 Subject: [PATCH 17/32] File structure changes to allow installer compile, fixes for gitignore --- .gitignore | 13 +++++++++---- .vscode/extensions.json | 7 ------- .vscode/settings.json | 12 ------------ src/main.cpp => CommandStation.cpp | 0 include/Config.h => Config.h | 6 +++--- platformio.ini | 1 + 6 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/settings.json rename src/main.cpp => CommandStation.cpp (100%) rename include/Config.h => Config.h (92%) diff --git a/.gitignore b/.gitignore index 89cc49c..21c53ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ .pio -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json -.vscode/ipch +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index e80666b..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "platformio.platformio-ide" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 1301145..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "files.associations": { - "array": "cpp", - "deque": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "string_view": "cpp", - "initializer_list": "cpp", - "cstdint": "cpp" - } -} \ No newline at end of file diff --git a/src/main.cpp b/CommandStation.cpp similarity index 100% rename from src/main.cpp rename to CommandStation.cpp diff --git a/include/Config.h b/Config.h similarity index 92% rename from include/Config.h rename to Config.h index 56ba0e7..4605be8 100644 --- a/include/Config.h +++ b/Config.h @@ -22,8 +22,8 @@ // Choose the motor shield that you want to use. -#define CONFIG_WSM_FIREBOX -//#define CONFIG_ARDUINO_MOTOR_SHIELD +//#define CONFIG_WSM_FIREBOX +#define CONFIG_ARDUINO_MOTOR_SHIELD //#define CONFIG_POLOLU_MOTOR_SHIELD -#endif \ No newline at end of file +#endif diff --git a/platformio.ini b/platformio.ini index 2fb4226..a976064 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,6 +10,7 @@ [platformio] default_envs = samd21, mega2560, mega328 +src_dir = . [env] lib_deps = From 6903995d6d644210e8910dc77c0d3e8676b8e526 Mon Sep 17 00:00:00 2001 From: Dex Date: Tue, 30 Jun 2020 22:54:03 -0400 Subject: [PATCH 18/32] Create CI workflow for Command Station --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..84fdf3e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,17 @@ +name: CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Install Python Wheel + run: pip install wheel + - name: Install PlatformIO Core + run: pip install -U https://github.com/platformio/platformio/archive/v4.2.1.zip + - name: Compile Command Station (AVR) + run: python -m platformio run From 4721c7150c68147ed83256cab797f6b61b3a715d Mon Sep 17 00:00:00 2001 From: dexslab Date: Wed, 1 Jul 2020 09:06:03 -0400 Subject: [PATCH 19/32] Add readme add back extensions and settings from Dave and fix gitignore --- .gitignore | 2 -- .vscode/extensions.json | 7 +++++++ .vscode/settings.json | 12 ++++++++++++ readme.md | 3 +++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 readme.md diff --git a/.gitignore b/.gitignore index 21c53ab..54361c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ .pio .vscode/* !.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json !.vscode/extensions.json *.code-workspace diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..e80666b --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ffa498a --- /dev/null +++ b/.vscode/settings.json @@ -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" + } +} diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..402608a --- /dev/null +++ b/readme.md @@ -0,0 +1,3 @@ +# CommandStation EX + +Welcome to the future of DCC++ and affordable model railroading. The team current working on this project have invested a lot of time know how and code to see this through. More to come soon!!!!! \ No newline at end of file From c67fa12e801ecf22c0df7970cd42761842ecc732 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Tue, 14 Jul 2020 03:42:48 -0600 Subject: [PATCH 20/32] Update path to CommandStation library --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index a976064..b16d180 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,7 +14,7 @@ src_dir = . [env] lib_deps = - https://github.com/davidcutting42/CommandStation.git#master + https://github.com/DCC-EX/CommandStation.git#master https://github.com/davidcutting42/ArduinoTimers.git#master [env:samd21] From 9e86d5e93c48536a76922152791cf91b933c586a Mon Sep 17 00:00:00 2001 From: David Cutting Date: Tue, 14 Jul 2020 19:04:55 -0600 Subject: [PATCH 21/32] Update interrupt handling for better waveforms --- CommandStation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CommandStation.cpp b/CommandStation.cpp index 6d7a079..ce75cb1 100644 --- a/CommandStation.cpp +++ b/CommandStation.cpp @@ -38,8 +38,10 @@ DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); #endif void waveform_IrqHandler() { - mainTrack->interruptHandler(); - progTrack->interruptHandler(); + bool mainInterrupt = mainTrack->interrupt1(); + bool progInterrupt = progTrack->interrupt1(); + if(mainInterrupt) mainTrack->interrupt2(); + if(progInterrupt) progTrack->interrupt2(); } #if defined(ARDUINO_ARCH_SAMD) From 2d9caa6f58bbd718f5ccfc7afe56bdb6b9025ff5 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 18 Jul 2020 06:18:06 -0600 Subject: [PATCH 22/32] Move stuff to Arduino folder, add callback registration --- .../CommandStation.ino | 21 +++++++++++++++---- Config.h => CommandStation/Config.h | 5 +++-- platformio.ini | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) rename CommandStation.cpp => CommandStation/CommandStation.ino (76%) rename Config.h => CommandStation/Config.h (89%) diff --git a/CommandStation.cpp b/CommandStation/CommandStation.ino similarity index 76% rename from CommandStation.cpp rename to CommandStation/CommandStation.ino index ce75cb1..cd2ef17 100644 --- a/CommandStation.cpp +++ b/CommandStation/CommandStation.ino @@ -26,9 +26,12 @@ const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; -#if defined CONFIG_WSM_FIREBOX -DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_Main(kNumLocos); -DCCService* progTrack = DCCService::Create_WSM_FireBox_Prog(); +#if defined CONFIG_WSM_FIREBOX_MK1 +DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_MK1_Main(kNumLocos); +DCCService* progTrack = DCCService::Create_WSM_FireBox_MK1_Prog(); +#elif defined CONFIG_WSM_FIREBOX_MK1S +DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_MK1S_Main(kNumLocos); +DCCService* progTrack = DCCService::Create_WSM_FireBox_MK1S_Prog(); #elif defined CONFIG_ARDUINO_MOTOR_SHIELD DCCMain* mainTrack = DCCMain::Create_Arduino_L298Shield_Main(kNumLocos); DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); @@ -49,6 +52,11 @@ void SERCOM4_Handler() { mainTrack->railcom.getSerial()->IrqHandler(); } +#elif defined(ARDUINO_ARCH_SAMC) +void SERCOM0_Handler() +{ + mainTrack->railcom.getSerial()->IrqHandler(); +} #endif void setup() { @@ -62,9 +70,15 @@ void setup() { TimerA.attachInterrupt(waveform_IrqHandler); TimerA.start(); + mainTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); + progTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); + #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); Wire.begin(); // Needed for EEPROM to work +#elif defined (ARDUINO_ARCH_SAMC) + CommManager::registerInterface(new SerialInterface(Serial)); + Wire.begin(); // Needed for EEPROM to work #elif defined(ARDUINO_ARCH_AVR) CommManager::registerInterface(new SerialInterface(Serial)); #endif @@ -82,4 +96,3 @@ void loop() { mainTrack->loop(); progTrack->loop(); } - diff --git a/Config.h b/CommandStation/Config.h similarity index 89% rename from Config.h rename to CommandStation/Config.h index 4605be8..28af7d2 100644 --- a/Config.h +++ b/CommandStation/Config.h @@ -22,8 +22,9 @@ // Choose the motor shield that you want to use. -//#define CONFIG_WSM_FIREBOX -#define CONFIG_ARDUINO_MOTOR_SHIELD +//#define CONFIG_WSM_FIREBOX_MK1 +#define CONFIG_WSM_FIREBOX_MK1S +//#define CONFIG_ARDUINO_MOTOR_SHIELD //#define CONFIG_POLOLU_MOTOR_SHIELD #endif diff --git a/platformio.ini b/platformio.ini index b16d180..0b70217 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,7 +10,7 @@ [platformio] default_envs = samd21, mega2560, mega328 -src_dir = . +src_dir = CommandStation [env] lib_deps = From 29b719ffd934801c5ad63ab6fbc168d83ed31be0 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 18 Jul 2020 06:24:29 -0600 Subject: [PATCH 23/32] Rename files to work in all environments --- CommandStation/CommandStation.ino => CommandStation-DCC.ino | 0 CommandStation/Config.h => Config.h | 0 platformio.ini | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename CommandStation/CommandStation.ino => CommandStation-DCC.ino (100%) rename CommandStation/Config.h => Config.h (100%) diff --git a/CommandStation/CommandStation.ino b/CommandStation-DCC.ino similarity index 100% rename from CommandStation/CommandStation.ino rename to CommandStation-DCC.ino diff --git a/CommandStation/Config.h b/Config.h similarity index 100% rename from CommandStation/Config.h rename to Config.h diff --git a/platformio.ini b/platformio.ini index 0b70217..b16d180 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,7 +10,7 @@ [platformio] default_envs = samd21, mega2560, mega328 -src_dir = CommandStation +src_dir = . [env] lib_deps = From 87a82f7c181fffb0994e91deabafb2ee064c0ab2 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Wed, 29 Jul 2020 17:03:09 -0600 Subject: [PATCH 24/32] Added free memory detection --- CommandStation-DCC.ino | 19 +++++++++++++++++++ Config.h | 4 ++-- FreeMemory.h | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 FreeMemory.h diff --git a/CommandStation-DCC.ino b/CommandStation-DCC.ino index cd2ef17..036bfac 100644 --- a/CommandStation-DCC.ino +++ b/CommandStation-DCC.ino @@ -22,6 +22,15 @@ #include #include "Config.h" +#include "FreeMemory.h" + +#if defined(ARDUINO_BOARD_UNO) +int ramLowWatermark = 16384; +#elif defined(ARDUINO_BOARD_MEGA_2560) +int ramLowWatermark = 64000; +#elif defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_SAMC) +int ramLowWatermark = 256000; +#endif const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; @@ -38,6 +47,8 @@ DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); #elif defined CONFIG_POLOLU_MOTOR_SHIELD DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(kNumLocos); DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); +#else +#error "Cannot compile - no board selected in Config.h" #endif void waveform_IrqHandler() { @@ -73,8 +84,10 @@ void setup() { mainTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); progTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); + // Register the serial interface #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); + while(!SerialUSB) {} // Wait for USB to come online (remove once wifi is implemented) Wire.begin(); // Needed for EEPROM to work #elif defined (ARDUINO_ARCH_SAMC) CommManager::registerInterface(new SerialInterface(Serial)); @@ -95,4 +108,10 @@ void loop() { CommManager::update(); mainTrack->loop(); progTrack->loop(); + + int freeNow=freeMemory(); + if (freeNow(sbrk(0)); +#else + return __brkval ? &top - __brkval : &top - __malloc_heap_start; +#endif // __arm__ +} +#endif \ No newline at end of file From 3b29bc002cc2ed0fcdf8f1c703c8cf1e91791e15 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Wed, 29 Jul 2020 17:17:34 -0600 Subject: [PATCH 25/32] Fixed it --- CommandStation-DCC.ino | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CommandStation-DCC.ino b/CommandStation-DCC.ino index 036bfac..d19b97f 100644 --- a/CommandStation-DCC.ino +++ b/CommandStation-DCC.ino @@ -24,13 +24,7 @@ #include "Config.h" #include "FreeMemory.h" -#if defined(ARDUINO_BOARD_UNO) -int ramLowWatermark = 16384; -#elif defined(ARDUINO_BOARD_MEGA_2560) -int ramLowWatermark = 64000; -#elif defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_SAMC) -int ramLowWatermark = 256000; -#endif +int ramLowWatermark = 256000; const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; From 170c9ab1ea6481d521b409e21033d592603ebbc6 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Thu, 30 Jul 2020 18:27:04 -0600 Subject: [PATCH 26/32] Move to new commmanager scheme --- CommandStation-DCC.ino | 11 +++++++++-- Config.h | 10 +++++----- FreeMemory.h | 6 +++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CommandStation-DCC.ino b/CommandStation-DCC.ino index d19b97f..94ba85b 100644 --- a/CommandStation-DCC.ino +++ b/CommandStation-DCC.ino @@ -24,7 +24,11 @@ #include "Config.h" #include "FreeMemory.h" +#if defined(ARDUINO_ARCH_AVR) +int ramLowWatermark = 32767; +#else int ramLowWatermark = 256000; +#endif const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; @@ -83,14 +87,17 @@ void setup() { CommManager::registerInterface(new USBInterface(SerialUSB)); while(!SerialUSB) {} // Wait for USB to come online (remove once wifi is implemented) Wire.begin(); // Needed for EEPROM to work + EEStore::init(&SerialUSB); #elif defined (ARDUINO_ARCH_SAMC) CommManager::registerInterface(new SerialInterface(Serial)); Wire.begin(); // Needed for EEPROM to work + EEStore::init(&Serial); #elif defined(ARDUINO_ARCH_AVR) CommManager::registerInterface(new SerialInterface(Serial)); + EEStore::init(&Serial); #endif - EEStore::init(); + // Set up the string parser to accept commands from the interfaces DCCEXParser::init(mainTrack, progTrack); @@ -106,6 +113,6 @@ void loop() { int freeNow=freeMemory(); if (freeNow. */ -#ifndef COMMANDSTATION_DCC_CONFIG -#define COMMANDSTATION_DCC_CONFIG +#ifndef COMMANDSTATION_DCC_CONFIG_H_ +#define COMMANDSTATION_DCC_CONFIG_H_ // Choose the motor shield that you want to use. -#define CONFIG_WSM_FIREBOX_MK1 +//#define CONFIG_WSM_FIREBOX_MK1 //#define CONFIG_WSM_FIREBOX_MK1S -//#define CONFIG_ARDUINO_MOTOR_SHIELD +#define CONFIG_ARDUINO_MOTOR_SHIELD //#define CONFIG_POLOLU_MOTOR_SHIELD -#endif +#endif // COMMANDSTATION_DCC_CONFIG_H_ diff --git a/FreeMemory.h b/FreeMemory.h index ca1158c..25d3d65 100644 --- a/FreeMemory.h +++ b/FreeMemory.h @@ -1,5 +1,5 @@ -#ifndef freeMemory_h -#define freeMemory_h +#ifndef COMMANDSTATION_DCC_FREEMEMORY_H_ +#define COMMANDSTATION_DCC_FREEMEMORY_H_ // thanks go to https://github.com/mpflaga/Arduino-MemoryFree #ifdef __arm__ @@ -17,4 +17,4 @@ int freeMemory() { return __brkval ? &top - __brkval : &top - __malloc_heap_start; #endif // __arm__ } -#endif \ No newline at end of file +#endif // COMMANDSTATION_DCC_FREEMEMORY_H_ \ No newline at end of file From 3773cfa7e96fc6c24bc82d874f6686b302e089b1 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Thu, 13 Aug 2020 18:53:21 -0600 Subject: [PATCH 27/32] Moved to subclasses for board management --- CommandStation-DCC.ino | 84 +++++++++++++++++++++++++++++++----------- Config.h | 3 ++ platformio.ini | 2 +- 3 files changed, 67 insertions(+), 22 deletions(-) diff --git a/CommandStation-DCC.ino b/CommandStation-DCC.ino index 94ba85b..85702e2 100644 --- a/CommandStation-DCC.ino +++ b/CommandStation-DCC.ino @@ -33,22 +33,21 @@ int ramLowWatermark = 256000; const uint8_t kIRQmicros = 29; const uint8_t kNumLocos = 50; -#if defined CONFIG_WSM_FIREBOX_MK1 -DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_MK1_Main(kNumLocos); -DCCService* progTrack = DCCService::Create_WSM_FireBox_MK1_Prog(); -#elif defined CONFIG_WSM_FIREBOX_MK1S -DCCMain* mainTrack = DCCMain::Create_WSM_FireBox_MK1S_Main(kNumLocos); -DCCService* progTrack = DCCService::Create_WSM_FireBox_MK1S_Prog(); -#elif defined CONFIG_ARDUINO_MOTOR_SHIELD -DCCMain* mainTrack = DCCMain::Create_Arduino_L298Shield_Main(kNumLocos); -DCCService* progTrack = DCCService::Create_Arduino_L298Shield_Prog(); +Railcom* mainRailcom; + +#if defined CONFIG_ARDUINO_MOTOR_SHIELD +BoardArduinoMotorShield* mainBoard; +BoardArduinoMotorShield* progBoard; #elif defined CONFIG_POLOLU_MOTOR_SHIELD -DCCMain* mainTrack = DCCMain::Create_Pololu_MC33926Shield_Main(kNumLocos); -DCCService* progTrack = DCCService::Create_Pololu_MC33926Shield_Prog(); +BoardPololuMotorShield* mainBoard; +BoardPololuMotorShield* progBoard; #else #error "Cannot compile - no board selected in Config.h" #endif +DCCMain* mainTrack; +DCCService* progTrack; + void waveform_IrqHandler() { bool mainInterrupt = mainTrack->interrupt1(); bool progInterrupt = progTrack->interrupt1(); @@ -59,18 +58,64 @@ void waveform_IrqHandler() { #if defined(ARDUINO_ARCH_SAMD) void SERCOM4_Handler() { - mainTrack->railcom.getSerial()->IrqHandler(); + mainTrack->railcom->getSerial()->IrqHandler(); } #elif defined(ARDUINO_ARCH_SAMC) void SERCOM0_Handler() { - mainTrack->railcom.getSerial()->IrqHandler(); + mainTrack->railcom->getSerial()->IrqHandler(); } #endif void setup() { + + +#if defined CONFIG_ARDUINO_MOTOR_SHIELD + BoardConfigArduinoMotorShield mainConfig; + BoardArduinoMotorShield::getDefaultConfigA(mainConfig); + mainConfig.track_power_callback = DCCEXParser::trackPowerCallback; + // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax + + // + mainBoard = new BoardArduinoMotorShield(mainConfig); + + BoardConfigArduinoMotorShield progConfig; + BoardArduinoMotorShield::getDefaultConfigB(progConfig); + progConfig.track_power_callback = DCCEXParser::trackPowerCallback; + // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax + + // + progBoard = new BoardArduinoMotorShield(progConfig); +#elif defined CONFIG_POLOLU_MOTOR_SHIELD + BoardConfigPololuMotorShield mainConfig; + BoardPololuMotorShield::getDefaultConfigA(mainConfig); + mainConfig.track_power_callback = DCCEXParser::trackPowerCallback; + // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax + + // + mainBoard = new BoardPololuMotorShield(mainConfig); + + BoardConfigPololuMotorShield progConfig; + BoardPololuMotorShield::getDefaultConfigB(progConfig); + progConfig.track_power_callback = DCCEXParser::trackPowerCallback; + // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax + + // + progBoard = new BoardPololuMotorShield(progConfig); +#endif + + RailComConfig rcomConfig; + Railcom::getDefaultConfig(rcomConfig); // Default is off + mainRailcom = new Railcom(rcomConfig); + + mainBoard->setup(); + mainTrack = new DCCMain(kNumLocos, mainBoard, mainRailcom); mainTrack->setup(); - progTrack->setup(); + + progBoard->setup(); + progTrack = new DCCService(progBoard); + progTrack->setup(); // Currently doesn't do anything, but may be extended later + progTrack->board->progMode(ON); // Limits current to 250mA. Current limit can be changed in config above. // 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 @@ -79,13 +124,10 @@ void setup() { TimerA.attachInterrupt(waveform_IrqHandler); TimerA.start(); - mainTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); - progTrack->hdw.config_setTrackPowerCallback(DCCEXParser::trackPowerCallback); - // Register the serial interface #if defined (ARDUINO_ARCH_SAMD) CommManager::registerInterface(new USBInterface(SerialUSB)); - while(!SerialUSB) {} // Wait for USB to come online (remove once wifi is implemented) + while(!SerialUSB) {} Wire.begin(); // Needed for EEPROM to work EEStore::init(&SerialUSB); #elif defined (ARDUINO_ARCH_SAMC) @@ -97,8 +139,6 @@ void setup() { EEStore::init(&Serial); #endif - - // Set up the string parser to accept commands from the interfaces DCCEXParser::init(mainTrack, progTrack); @@ -110,9 +150,11 @@ void loop() { mainTrack->loop(); progTrack->loop(); +#if defined(FREE_MEM_PRINT) int freeNow=freeMemory(); if (freeNow Date: Fri, 14 Aug 2020 11:59:03 -0600 Subject: [PATCH 28/32] Renamed library dependencies --- CommandStation-DCC.ino => CommandStation-EX.ino | 2 +- platformio.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename CommandStation-DCC.ino => CommandStation-EX.ino (99%) diff --git a/CommandStation-DCC.ino b/CommandStation-EX.ino similarity index 99% rename from CommandStation-DCC.ino rename to CommandStation-EX.ino index 94ba85b..aaa2641 100644 --- a/CommandStation-DCC.ino +++ b/CommandStation-EX.ino @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include "Config.h" diff --git a/platformio.ini b/platformio.ini index b16d180..f9e36e7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,7 +14,7 @@ src_dir = . [env] lib_deps = - https://github.com/DCC-EX/CommandStation.git#master + https://github.com/DCC-EX/DCC-EX-Lib.git#master https://github.com/davidcutting42/ArduinoTimers.git#master [env:samd21] From 867c949674abfa9707089ffbba72ccf641860d6f Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 15 Aug 2020 00:11:28 -0600 Subject: [PATCH 29/32] Added support for Uno Wifi R2 and Nano Every --- CommandStation-EX.ino | 2 +- platformio.ini | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino index aaa2641..c99ebc0 100644 --- a/CommandStation-EX.ino +++ b/CommandStation-EX.ino @@ -92,7 +92,7 @@ void setup() { CommManager::registerInterface(new SerialInterface(Serial)); Wire.begin(); // Needed for EEPROM to work EEStore::init(&Serial); -#elif defined(ARDUINO_ARCH_AVR) +#elif defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR) CommManager::registerInterface(new SerialInterface(Serial)); EEStore::init(&Serial); #endif diff --git a/platformio.ini b/platformio.ini index f9e36e7..c7b7941 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = samd21, mega2560, mega328 +default_envs = samd21, mega2560, mega328, unowifiR2 src_dir = . [env] @@ -40,4 +40,11 @@ board = uno framework = arduino lib_deps = ${env.lib_deps} - DIO2 \ No newline at end of file + DIO2 + +[env:unowifiR2] +platform = atmelmegaavr +board = uno_wifi_rev2 +framework = arduino +lib_deps = + ${env.lib_deps} \ No newline at end of file From 6e3e8d738d21b45fd2643253a4c538f12dace085 Mon Sep 17 00:00:00 2001 From: David Cutting Date: Sat, 22 Aug 2020 14:12:53 -0600 Subject: [PATCH 30/32] Remove UNO WiFi Rev2 from default build sequence Was fouling up the automated checks --- platformio.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index c7b7941..cbfafb0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = samd21, mega2560, mega328, unowifiR2 +default_envs = samd21, mega2560, mega328 src_dir = . [env] @@ -42,9 +42,10 @@ lib_deps = ${env.lib_deps} DIO2 +; unowifirev2 needs major work before it is ready for production [env:unowifiR2] platform = atmelmegaavr board = uno_wifi_rev2 framework = arduino lib_deps = - ${env.lib_deps} \ No newline at end of file + ${env.lib_deps} From ff296d6c0259770da894cea7b66c60e72c481f73 Mon Sep 17 00:00:00 2001 From: FrightRisk <37218136+FrightRisk@users.noreply.github.com> Date: Wed, 26 Aug 2020 18:19:42 -0400 Subject: [PATCH 31/32] Change platformio.ini --- platformio.ini | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/platformio.ini b/platformio.ini index cbfafb0..f9ad299 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,43 +9,48 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = samd21, mega2560, mega328 +default_envs = + mega2560 + uno src_dir = . [env] lib_deps = - https://github.com/DCC-EX/DCC-EX-Lib.git#master - https://github.com/davidcutting42/ArduinoTimers.git#master - + https://github.com/DCC-EX/DCC-EX-Lib.git#master + https://github.com/davidcutting42/ArduinoTimers.git#master + [env:samd21] platform = atmelsam board = sparkfun_samd21_dev_usb framework = arduino upload_protocol = atmel-ice lib_deps = - ${env.lib_deps} - SparkFun External EEPROM Arduino Library + ${env.lib_deps} + SparkFun External EEPROM Arduino Library [env:mega2560] platform = atmelavr board = megaatmega2560 framework = arduino lib_deps = - ${env.lib_deps} - DIO2 + ${env.lib_deps} + DIO2 [env:mega328] platform = atmelavr board = uno framework = arduino lib_deps = - ${env.lib_deps} - DIO2 + ${env.lib_deps} + DIO2 -; unowifirev2 needs major work before it is ready for production [env:unowifiR2] platform = atmelmegaavr board = uno_wifi_rev2 framework = arduino -lib_deps = - ${env.lib_deps} +lib_deps = ${env.lib_deps} + +[env:uno] +platform = atmelavr +board = uno +framework = arduino From dab8dd08fefd51ae18d9482ede2b5be90818264a Mon Sep 17 00:00:00 2001 From: FrightRisk <37218136+FrightRisk@users.noreply.github.com> Date: Fri, 18 Sep 2020 17:06:41 -0400 Subject: [PATCH 32/32] Delete files after moving to BS-FB to update this project with CVReader code --- CommandStation-EX.ino | 160 ------------------------------------------ Config.h | 33 --------- FreeMemory.h | 20 ------ 3 files changed, 213 deletions(-) delete mode 100644 CommandStation-EX.ino delete mode 100644 Config.h delete mode 100644 FreeMemory.h diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino deleted file mode 100644 index 1026fe4..0000000 --- a/CommandStation-EX.ino +++ /dev/null @@ -1,160 +0,0 @@ -/* - * main.cpp - * - * This file is part of CommandStation-DCC. - * - * CommandStation-DCC is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * CommandStation-DCC is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CommandStation-DCC. If not, see . - */ - -#include -#include -#include - -#include "Config.h" -#include "FreeMemory.h" - -#if defined(ARDUINO_ARCH_AVR) -int ramLowWatermark = 32767; -#else -int ramLowWatermark = 256000; -#endif - -const uint8_t kIRQmicros = 29; -const uint8_t kNumLocos = 50; - -Railcom* mainRailcom; - -#if defined CONFIG_ARDUINO_MOTOR_SHIELD -BoardArduinoMotorShield* mainBoard; -BoardArduinoMotorShield* progBoard; -#elif defined CONFIG_POLOLU_MOTOR_SHIELD -BoardPololuMotorShield* mainBoard; -BoardPololuMotorShield* progBoard; -#else -#error "Cannot compile - no board selected in Config.h" -#endif - -DCCMain* mainTrack; -DCCService* progTrack; - -void waveform_IrqHandler() { - bool mainInterrupt = mainTrack->interrupt1(); - bool progInterrupt = progTrack->interrupt1(); - if(mainInterrupt) mainTrack->interrupt2(); - if(progInterrupt) progTrack->interrupt2(); -} - -#if defined(ARDUINO_ARCH_SAMD) -void SERCOM4_Handler() -{ - mainTrack->railcom->getSerial()->IrqHandler(); -} -#elif defined(ARDUINO_ARCH_SAMC) -void SERCOM0_Handler() -{ - mainTrack->railcom->getSerial()->IrqHandler(); -} -#endif - -void setup() { - - -#if defined CONFIG_ARDUINO_MOTOR_SHIELD - BoardConfigArduinoMotorShield mainConfig; - BoardArduinoMotorShield::getDefaultConfigA(mainConfig); - mainConfig.track_power_callback = DCCEXParser::trackPowerCallback; - // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax - - // - mainBoard = new BoardArduinoMotorShield(mainConfig); - - BoardConfigArduinoMotorShield progConfig; - BoardArduinoMotorShield::getDefaultConfigB(progConfig); - progConfig.track_power_callback = DCCEXParser::trackPowerCallback; - // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax - - // - progBoard = new BoardArduinoMotorShield(progConfig); -#elif defined CONFIG_POLOLU_MOTOR_SHIELD - BoardConfigPololuMotorShield mainConfig; - BoardPololuMotorShield::getDefaultConfigA(mainConfig); - mainConfig.track_power_callback = DCCEXParser::trackPowerCallback; - // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax - - // - mainBoard = new BoardPololuMotorShield(mainConfig); - - BoardConfigPololuMotorShield progConfig; - BoardPololuMotorShield::getDefaultConfigB(progConfig); - progConfig.track_power_callback = DCCEXParser::trackPowerCallback; - // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax - - // - progBoard = new BoardPololuMotorShield(progConfig); -#endif - - RailComConfig rcomConfig; - Railcom::getDefaultConfig(rcomConfig); // Default is off - mainRailcom = new Railcom(rcomConfig); - - mainBoard->setup(); - mainTrack = new DCCMain(kNumLocos, mainBoard, mainRailcom); - mainTrack->setup(); - - progBoard->setup(); - progTrack = new DCCService(progBoard); - progTrack->setup(); // Currently doesn't do anything, but may be extended later - progTrack->board->progMode(ON); // Limits current to 250mA. Current limit can be changed in config above. - - // 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 - TimerA.initialize(); - TimerA.setPeriod(kIRQmicros); - TimerA.attachInterrupt(waveform_IrqHandler); - TimerA.start(); - - // Register the serial interface -#if defined (ARDUINO_ARCH_SAMD) - CommManager::registerInterface(new USBInterface(SerialUSB)); - while(!SerialUSB) {} - Wire.begin(); // Needed for EEPROM to work - EEStore::init(&SerialUSB); -#elif defined (ARDUINO_ARCH_SAMC) - CommManager::registerInterface(new SerialInterface(Serial)); - Wire.begin(); // Needed for EEPROM to work - EEStore::init(&Serial); -#elif defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR) - CommManager::registerInterface(new SerialInterface(Serial)); - EEStore::init(&Serial); -#endif - - // Set up the string parser to accept commands from the interfaces - DCCEXParser::init(mainTrack, progTrack); - - CommManager::showInitInfo(); -} - -void loop() { - CommManager::update(); - mainTrack->loop(); - progTrack->loop(); - -#if defined(FREE_MEM_PRINT) - int freeNow=freeMemory(); - if (freeNow. - */ - -#ifndef COMMANDSTATION_DCC_CONFIG_H_ -#define COMMANDSTATION_DCC_CONFIG_H_ - -// Choose the motor shield that you want to use. - -//#define CONFIG_WSM_FIREBOX_MK1 -//#define CONFIG_WSM_FIREBOX_MK1S -#define CONFIG_ARDUINO_MOTOR_SHIELD -//#define CONFIG_POLOLU_MOTOR_SHIELD - -// Comment out this line to disable printing free memory every time it shrinks -#define FREE_MEM_PRINT - -#endif // COMMANDSTATION_DCC_CONFIG_H_ diff --git a/FreeMemory.h b/FreeMemory.h deleted file mode 100644 index 25d3d65..0000000 --- a/FreeMemory.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef COMMANDSTATION_DCC_FREEMEMORY_H_ -#define COMMANDSTATION_DCC_FREEMEMORY_H_ - -// thanks go to https://github.com/mpflaga/Arduino-MemoryFree -#ifdef __arm__ -// should use uinstd.h to define sbrk but Due causes a conflict -extern "C" char* sbrk(int incr); -#else -extern char *__brkval; -#endif // __arm__ - -int freeMemory() { - char top; -#ifdef __arm__ - return &top - reinterpret_cast(sbrk(0)); -#else - return __brkval ? &top - __brkval : &top - __malloc_heap_start; -#endif // __arm__ -} -#endif // COMMANDSTATION_DCC_FREEMEMORY_H_ \ No newline at end of file