dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 21:21:24 +01:00
Code Releases Activity

Merge pull request #10 from DCC-EX/master

Browse Source 
merge upstream changes
This commit is contained in:
mstevetodd 2020-12-16 11:39:23 -05:00 committed by GitHub
commit 9d0dbf7878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DCCEX.h
View File

@ -10,7 +10,9 @@
#include "DCCEXParser.h"
#include "version.h"
#include "WifiInterface.h"
#if ETHERNET_ON == true
#include "EthernetInterface.h"
#endif
#include "LCD_Implementation.h"
#include "freeMemory.h"
#include <Arduino.h>

5
DCCEXParser.cpp
View File

@ -272,7 +272,8 @@ void DCCEXParser::parse(Print *stream, byte *com, bool blocking)
else
break;
// Convert JMRI bizarre -1=emergency stop, 0-126 as speeds
// Convert DCC-EX protocol speed steps where
// -1=emergency stop, 0-126 as speeds
// to DCC 0=stop, 1= emergency stop, 2-127 speeds
if (tspeed > 126 || tspeed < -1)
break; // invalid JMRI speed code
@ -434,7 +435,7 @@ void DCCEXParser::parse(Print *stream, byte *com, bool blocking)
return;
case 'c': // READ CURRENT <c>
StringFormatter::send(stream, F("<a %d>"), DCCWaveform::mainTrack.getLastCurrent());
StringFormatter::send(stream, F("<a %d>"), DCCWaveform::mainTrack.get1024Current());
return;
case 'Q': // SENSORS <Q>

5
DCCWaveform.h
View File

@ -57,6 +57,11 @@ class DCCWaveform {
POWERMODE getPowerMode();
void checkPowerOverload();
int getLastCurrent();
inline int get1024Current() {
if (powerMode == POWERMODE::ON)
return (int)(lastCurrent*(long int)1024/motorDriver->getRawCurrentTripValue());
return 0;
}
void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
volatile bool packetPending;
volatile byte sentResetsSincePacket;

9
EthernetInterface.cpp
View File

@ -18,6 +18,9 @@
*
*/
#include "config.h"
#include "defines.h" // This should be changed to DCCEX.h when possible
#if ETHERNET_ON == true
#include "EthernetInterface.h"
#include "DIAG.h"
#include "CommandDistributor.h"
@ -167,7 +170,5 @@ void EthernetInterface::loop()
for(;count>0;count--) clients[socketOut].write(outboundRing->read());
clients[socketOut].flush(); //maybe
}
}
}
#endif

5
LCD_Implementation.h
View File

@ -25,6 +25,8 @@
// which libraray is involved.
////////////////////////////////////////////////////////////////////////////////////
#ifndef LCD_Implementation_h
#define LCD_Implementation_h
#include "config.h"
#include <Wire.h>
#include "LCDDisplay.h"
@ -51,5 +53,4 @@ LCDDisplay * LCDDisplay::lcdDisplay=0;
#define CONDITIONAL_LCD_START if (false) /* NO LCD CONFIG */
#endif
#endif // LCD_Implementation_h

8
config.example.h
View File

@ -76,6 +76,14 @@ The configuration file for DCC++ EX Command Station
//
//#define WIFI_CONNECT_TIMEOUT 14000
/////////////////////////////////////////////////////////////////////////////////////
//
// ENABLE_ETHERNET: Set to true if you have an Arduino Ethernet card (wired). This
// is not for Wifi. You will then need the Arduino Ethernet library as well
//
//#define ENABLE_ETHERNET true
/////////////////////////////////////////////////////////////////////////////////////
//
// DEFINE STATIC IP ADDRESS *OR* COMMENT OUT TO USE DHCP

2
version.h
View File

@ -4,7 +4,7 @@
#include "StringFormatter.h"
// const char VERSION[] PROGMEM ="0.2.0";
#define VERSION "3.0.0"
#define VERSION "3.0.1"
#endif