mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-27 01:56:14 +01:00
214e6c643f
commitb34205b142
Merge:8703248
2829716
Author: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com> Date: Mon Aug 23 10:05:54 2021 +0100 Merge branch 'EX-RAIL' into ackRetry commit8703248c49
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sun Aug 22 16:47:38 2021 -0500 ACK RETRY max 255 with fallback to 3 if greater And includes LCD lines for power and ACK diags. commitf5d4522ed7
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sun Aug 22 16:40:13 2021 -0500 ACK RETRY updated datatypes commit1dbf236697
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sun Aug 22 16:35:14 2021 -0500 ACK RETRY updated datatypes commitd93584e9a4
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sun Aug 22 13:16:24 2021 -0500 ACK RETRY updated default is 2 retries. commitf58ebac670
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sat Aug 21 16:43:21 2021 -0500 ACK RETRY is 3 or less (default is 1) commit08350b215a
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sat Aug 21 11:55:17 2021 -0500 ACK RETRY LCD display update. lcd(0, F("RETRY %d %d %d %d"), ackManagerCv, ackManagerRetry, ackRetry, ackRetrySum); commit11cd216017
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sat Aug 21 00:54:28 2021 -0500 ACK RETRY ACK retry code added to ackManagerSetup and callback. The default is <D ACK RETRY 1>. For ACK tuning, set retry to zero. Retry count is captured on the LCD display, and lines in the serial monitor. commitb67027a1ed
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sat Aug 21 00:33:01 2021 -0500 ACK RETRY variables added commit34d2ab3543
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Sat Aug 21 00:23:34 2021 -0500 Update DCCEXParser.cpp LCD lines added to display power commands and ACK settings, when updated. Also new command <D ACK RETRY 1>. commit8ca4011cb0
Author: Ash-4 <81280775+Ash-4@users.noreply.github.com> Date: Fri Aug 20 23:58:13 2021 -0500 Update CommandStation-EX.ino Update LCD row number for Ready and Free RAM. commit6571138389
Author: Harald Barth <haba@kth.se> Date: Sun Aug 1 22:08:34 2021 +0200 optimize command parser for size commitc4f659243e
Author: Harald Barth <haba@kth.se> Date: Sun Aug 1 15:07:06 2021 +0200 optimize for loops for size (and speed) commit55b7091d5a
Author: Harald Barth <haba@kth.se> Date: Sun Aug 1 12:45:29 2021 +0200 take less progmem for messages commit6d7c1925b0
Author: Harald Barth <haba@kth.se> Date: Sun Aug 1 11:56:12 2021 +0200 only pragma -O3 critical functions
155 lines
5.2 KiB
C++
155 lines
5.2 KiB
C++
////////////////////////////////////////////////////////////////////////////////////
|
|
// DCC-EX CommandStation-EX Please see https://DCC-EX.com
|
|
//
|
|
// This file is the main sketch for the Command Station.
|
|
//
|
|
// CONFIGURATION:
|
|
// Configuration is normally performed by editing a file called config.h.
|
|
// This file is NOT shipped with the code so that if you pull a later version
|
|
// of the code, your configuration will not be overwritten.
|
|
//
|
|
// If you used the automatic installer program, config.h will have been created automatically.
|
|
//
|
|
// To obtain a starting copy of config.h please copy the file config.example.h which is
|
|
// shipped with the code and may be updated as new features are added.
|
|
//
|
|
// If config.h is not found, config.example.h will be used with all defaults.
|
|
////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#if __has_include ( "config.h")
|
|
#include "config.h"
|
|
#else
|
|
#warning config.h not found. Using defaults from config.example.h
|
|
#include "config.example.h"
|
|
#endif
|
|
|
|
|
|
/*
|
|
* © 2020,2021 Chris Harlow, Harald Barth, David Cutting,
|
|
* Fred Decker, Gregor Baues, Anthony W - Dayton All rights reserved.
|
|
*
|
|
* This file is part of CommandStation-EX
|
|
*
|
|
* This 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.
|
|
*
|
|
* It 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. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "DCCEX.h"
|
|
|
|
// Create a serial command parser for the USB connection,
|
|
// This supports JMRI or manual diagnostics and commands
|
|
// to be issued from the USB serial console.
|
|
DCCEXParser serialParser;
|
|
|
|
void setup()
|
|
{
|
|
// The main sketch has responsibilities during setup()
|
|
|
|
// Responsibility 1: Start the usb connection for diagnostics
|
|
// This is normally Serial but uses SerialUSB on a SAMD processor
|
|
Serial.begin(115200);
|
|
|
|
DIAG(F("License GPLv3 fsf.org (c) dcc-ex.com"));
|
|
|
|
CONDITIONAL_LCD_START {
|
|
// This block is still executed for DIAGS if LCD not in use
|
|
LCD(0,F("DCC++ EX v%S"),F(VERSION));
|
|
LCD(1,F("Lic GPLv3"));
|
|
}
|
|
|
|
// Responsibility 2: Start all the communications before the DCC engine
|
|
// Start the WiFi interface on a MEGA, Uno cannot currently handle WiFi
|
|
// Start Ethernet if it exists
|
|
#if WIFI_ON
|
|
WifiInterface::setup(WIFI_SERIAL_LINK_SPEED, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME), IP_PORT, WIFI_CHANNEL);
|
|
#endif // WIFI_ON
|
|
|
|
#if ETHERNET_ON
|
|
EthernetInterface::setup();
|
|
#endif // ETHERNET_ON
|
|
|
|
// Responsibility 3: Start the DCC engine.
|
|
// Note: this provides DCC with two motor drivers, main and prog, which handle the motor shield(s)
|
|
// Standard supported devices have pre-configured macros but custome hardware installations require
|
|
// detailed pin mappings and may also require modified subclasses of the MotorDriver to implement specialist logic.
|
|
// STANDARD_MOTOR_SHIELD, POLOLU_MOTOR_SHIELD, FIREBOX_MK1, FIREBOX_MK1S are pre defined in MotorShields.h
|
|
DCC::begin(MOTOR_SHIELD_TYPE);
|
|
|
|
// Start RMFT (ignored if no automnation)
|
|
RMFT::begin();
|
|
|
|
// Link to and call mySetup() function (if defined in the build in mySetup.cpp).
|
|
// The contents will depend on the user's system hardware configuration.
|
|
// The mySetup.cpp file is a standard C++ module so has access to all of the DCC++EX APIs.
|
|
extern __attribute__((weak)) void mySetup();
|
|
if (mySetup) {
|
|
mySetup();
|
|
}
|
|
|
|
// Invoke any DCC++EX commands in the form "SETUP("xxxx");"" found in optional file mySetup.h.
|
|
// This can be used to create turnouts, outputs, sensors etc. throught the normal text commands.
|
|
#if __has_include ( "mySetup.h")
|
|
#define SETUP(cmd) serialParser.parse(F(cmd))
|
|
#include "mySetup.h"
|
|
#undef SETUP
|
|
#endif
|
|
|
|
#if defined(LCN_SERIAL)
|
|
LCN_SERIAL.begin(115200);
|
|
LCN::init(LCN_SERIAL);
|
|
#endif
|
|
|
|
LCD(3,F("Ready"));
|
|
}
|
|
|
|
void loop()
|
|
{
|
|
// The main sketch has responsibilities during loop()
|
|
|
|
// Responsibility 1: Handle DCC background processes
|
|
// (loco reminders and power checks)
|
|
DCC::loop();
|
|
|
|
// Responsibility 2: handle any incoming commands on USB connection
|
|
serialParser.loop(Serial);
|
|
|
|
// Responsibility 3: Optionally handle any incoming WiFi traffic
|
|
#if WIFI_ON
|
|
WifiInterface::loop();
|
|
#endif
|
|
#if ETHERNET_ON
|
|
EthernetInterface::loop();
|
|
#endif
|
|
|
|
RMFT::loop(); // ignored if no automation
|
|
|
|
#if defined(LCN_SERIAL)
|
|
LCN::loop();
|
|
#endif
|
|
|
|
LCDDisplay::loop(); // ignored if LCD not in use
|
|
|
|
// Handle/update IO devices.
|
|
IODevice::loop();
|
|
|
|
// Report any decrease in memory (will automatically trigger on first call)
|
|
static int ramLowWatermark = __INT_MAX__; // replaced on first loop
|
|
|
|
int freeNow = minimumFreeMemory();
|
|
if (freeNow < ramLowWatermark)
|
|
{
|
|
ramLowWatermark = freeNow;
|
|
LCD(3,F("Free RAM=%5db"), ramLowWatermark);
|
|
}
|
|
}
|