dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-30 11:36:13 +01:00
Code Releases Activity
2,501 Commits 90 Branches 95 Tags 21 MiB
6798bd97cd
Commit Graph

139 Commits

Author SHA1 Message Date
Asbelos
6eb7051fd6 LCC and signal compile-out 
LCC commands in EXRAIL for OpenMRN Adapter

FIrst use of compile-out of unused features.
 2023-10-13 13:59:06 +01:00
Colin Murdoch
25bbfa4c68 Fix <1 JOIN> 
Fixed <1 JOIN> issue in TrackManager
 2023-09-27 14:46:48 +01:00
Colin Murdoch
17c004aecf Code corrections 
code corrections
 2023-09-25 14:32:54 +01:00
Colin Murdoch
aacb980dc8 Power control plus EXRAIL 
Power Control <0 A> etc plus EXRAIL SET_POWER
Not yet fully tested.
 2023-09-24 15:40:42 +01:00
peteGSX
da6a3c442f Remove redundant line 2023-09-10 18:41:14 +10:00
peteGSX
eb450dbd89
Merge branch 'devel' into add-turntable-object 2023-09-10 07:13:16 +10:00
peteGSX
7ee2c29a52 Include HAL create with EXTT_TURNTABLE 2023-09-10 05:30:48 +10:00
peteGSX
be10be5a1a Added angles 2023-09-09 07:22:10 +10:00
peteGSX
bd02d1c15b WAITFORTT ready for testing 2023-09-07 07:58:19 +10:00
peteGSX
6adff43f4b Update add position 2023-09-06 07:59:43 +10:00
Colin Murdoch
2f8e915b1e Added AFTEROVERLOAD 
Added the AFTEROVERLOAD option - as yet untested.
 2023-09-05 12:21:09 +01:00
peteGSX
004d10ee58 Fix build errors 2023-09-02 18:45:59 +10:00
peteGSX
e734661d1b EXRAIL ready for testing 2023-09-02 08:29:49 +10:00
Colin Murdoch
247763ac00 Code Corrections 
Code corrections
 2023-08-12 19:10:35 +01:00
Colin Murdoch
e327e0ae8d Added ONOVERLOAD 
Added code changes to create ONOVERLOAD command in EXRAIL
 2023-08-12 18:40:48 +01:00
Harald Barth
c22d789513 INT16_MAX was missing at more places 2023-05-23 18:59:03 +02:00
Harald Barth
ecc366cbd1 Merge branch '332-feature-request-add-a-no-programming-option-to-save-ram-on-uno' into devel 2023-05-09 14:11:18 +02:00
Asbelos
6781e44fdd Fix EXRAIL speed issue 2023-05-02 22:02:52 +01:00
Asbelos
28d9843133 Broadcast changes in EXRAIlr 2023-05-01 14:25:45 +01:00
Harald Barth
4eaad2d05b disable more PROG stuff (JOIN/UNJOIN from EXRAIL) 2023-04-23 22:45:47 +02:00
peteGSX
b6f8889e8c Disable most programming functions 2023-04-20 07:08:11 +10:00
Colin Murdoch
33306219c8 Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel 2023-04-19 19:46:12 +01:00
Colin Murdoch
d857c4f2e4 Added to Copyright notice 
Added my name to copyright notice
 2023-04-19 19:45:40 +01:00
Asbelos
70fae16ab3 Correct response to <JA 0> 2023-04-19 11:18:47 +01:00
Colin Murdoch
294b9693c5 Additions to FastClock 
Added ONCLOCKMINS to fastclock to allow hourly repeated events.
 2023-04-12 12:07:08 +01:00
Neil McKechnie
86c3020672 Correct display of high VPIN numbers in diagnostic output. 
No functional change.
VPINs are unsigned integers in the range 0-65535 (although the highest values are special, 65535=VPIN_NONE).  Values above 32767 were erroneously being displayed as negative.  This has been fixed, which is a pre-requisite for allowing VPINs above 32767 to be used.
 2023-03-27 13:08:14 +01:00
Asbelos
329dc41452 Remove implicit AUTOSTART 2023-03-18 18:52:01 +00:00
Asbelos
5e60fb4e27 SAMD21 odd byte boundary 2023-03-11 22:46:11 +00:00
pmantoine
67bd886a98 USB Serial fixes for EX-RAIL & debug 2023-02-15 08:51:21 +08:00
Neil McKechnie
35f3cca9b3 Rename LCDDisplay class to Display; renameEXRAIL LCD2 macro to SCREEN 2023-02-11 23:37:09 +00:00
Neil McKechnie
8be9d9e0b0 Support for multiple displays (OLED etc). 
New EXRAIL command LCD2(display,row,"text").  Display 0 is the usual one, other displays can be configured through HAL.
 2023-02-11 15:47:50 +00:00
Harald Barth
c91d66549c Remove warnings 2023-01-27 19:42:55 +01:00
Harald Barth
2c0886bc2f version and copyright info 2023-01-27 17:03:39 +01:00
Harald Barth
88b572a148 Add EXRAIL IFLOCO function 2023-01-26 16:55:58 +01:00
Colin Murdoch
c69b8d85c8 Merge branch 'devel-plus-fastclock' into devel 2023-01-24 12:30:48 +00:00
peteGSX
aaf25d5426 Remove excess comments 2023-01-23 04:53:39 +10:00
peteGSX
fb9170ab8b SIGNAL/SIGNALH operating correctly 2023-01-22 19:25:00 +10:00
Colin Murdoch
cd46d3c9e0 Remove #ifdef and merge calcs 
Remove #idfef statements and merge duplicate routines into CommandDistributor
 2023-01-21 10:18:54 +00:00
Colin Murdoch
8fac20a451 Add #ifdef selections 
Add #ifdef selections linked to #define in config.exampe.h
 2023-01-16 18:16:25 +00:00
Colin Murdoch
ff7260b9bc Added code for FastClock 
Added code for both I2C fastclock and serial clocks
 2023-01-11 17:36:11 +00:00
peteGSX
ec4dfb8c1e New working rotary encoder branch 2022-12-30 09:46:42 +10:00
Asbelos
1d61a8f3f9 HIGHMEM + WITHROTTLE 
EXRAIL HIGHMEM feature affects parser and withrottle.

Ringstream and wifi fixes

Withrottle connecting / reconnecting
 2022-12-16 13:14:48 +00:00
pmantoine
d95096ded8 Fixes STM32 compiler warning, and WIT/WIFI diags 2022-11-30 10:11:27 +08:00
Harald Barth
d062de2eb8 better pseudo random 2022-11-24 20:24:57 +01:00
Harald Barth
d874ad8cc3 Make GETFLASHW code more universal 2022-11-09 00:52:07 +01:00
Harald Barth
452ffc5725 changed IODevice code to use ADCee 2022-10-05 23:14:07 +02:00
Harald Barth
02ed7828c1 EX-RAIL bugfix: Could not read long loco addrs 2022-09-13 22:47:24 +02:00
Harald Barth
ad6c1384c9 EXRAIL bugfix, protect RANDWAIT from division by zero. Triggered by DELAYRANDOM(X, X+99) or less diff 2022-09-05 09:02:35 +02:00
Asbelos
7d6c2c8afb smaller random 
Saves over 300 bytes of progmem on a uno by omitting the random library
 2022-06-18 13:58:46 +01:00
Asbelos
6104311ccb Signal fixes and DCC_SIGNAL/VIRTUAL_SIGNAL 2022-06-18 12:31:54 +01:00
Asbelos
d0e71875e0 UNTESTED ONRED/ONAMBER/ONGREEN 
with genericl code tidy for other ON handlers.
 2022-06-17 11:48:37 +01:00
Harald Barth
5eb9678437 Merge branch 'master' into TrackManager-PORTX 2022-06-11 21:40:08 +02:00
Asbelos
ebebd0dc11 Improved display and loop time for signals. 2022-05-19 09:03:28 +01:00
Asbelos
506b65d0ea Fix </> command for signals 2022-05-18 17:44:41 +01:00
Fred
977802f160
Servo signal (#227) 
Prepping for version 4.1

SERVO_SIGNAL definition in EXRAIL
SERVO_SIGNAL(vpin, redpos, amberpos, greenpos)

use RED/AMBER/GREEN as for led signals.

* SIGNALH, ATGTE, ATLT

UNTESTED

* Automatic ALIAS(name)

and _ in keywords

* EXRAIL FORGET current loco

* EXRAIL </KILL ALL>

* EXRAIL VIRTUAL_TURNOUT

* Cleanup version.h

* Update version.h (#223)

Rewrite & Updated the 4.0.0 Section

* </KILL ALL> fix

* Incoming LCN turnout throw.

* KILLALL macro

and DIAGNOSTIC messages when KILL command used.

* EXRAIL PARSE

* Rebuild throttle info getters

UNTESTED... create different methods to obtain throttle info without being withrottle specific.

Also implements turnout description of "*" as hidden.

* J command parsing

JA JR JT commands parsed
EXRAIL sets hidden turnout state
HIDDEN description macro
Turnouts hidden flag bit
UNO seems OK, MEGA UNTESTED

* Assist notes draft & syntax tweaks

* Throttle notes

* uno memory saver

* JA JR and <t cab>

* Subtle corrections

* Update version.h

* I2C code corrections

Corrections to I2C code:
1) I2CManager_Mega4809.h: Correct bitwise 'and' to logical 'and' - no impact.
2) I2CManager_Wire.h: Ensure that error codes from Wire subsystem are passed back to caller in queueRequest().

* RAG Ifs and cmds

* IF block perf/memory

* Allow negative route ids.

* correct GREEN keyword

* Update version.h

* myFilter auto detect

* Update version.h

* fix weak ref to myFilter

* ACK defaults now 50-2000-20000

* Update version.h

* Improved SIGNALs startup and diagnostics

* Update IO_PCA9685.cpp

* Allow turnout id 0

* Position servo pin used as GPIO

* NoPowerOff LEDS

* CALLBACK parameter optional for Write

* WRITE CV ON PROG <W CV VALUE>

Callback parameters are now optional on PROG

* Updated CV read command <R cv>

Equivalent to <V cv 0>  uses the verify callback.

Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Kcsmith0708 <kcsmith0708@wowway.com>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Ash-4 <81280775+Ash-4@users.noreply.github.com>
 2022-05-03 16:53:33 -04:00
Asbelos
228553013b Merge branch 'ServoSignal' into TrackManager 2022-04-29 20:53:48 +01:00
Asbelos
e7fb3648b0 Allow turnout id 0 2022-04-29 19:33:44 +01:00
Asbelos
bcd1335b08 Merge branch 'ServoSignal' into TrackManager 2022-04-29 13:58:26 +01:00
Asbelos
afd94f0645 Improved SIGNALs startup and diagnostics 2022-04-29 11:56:17 +01:00
Asbelos
9273265036 Merge branch 'ServoSignal' into TrackManager 2022-04-18 16:59:02 +01:00
Asbelos
6515f1b512 correct GREEN keyword 2022-04-18 16:47:07 +01:00
Asbelos
920fcbc095 IF block perf/memory 2022-04-17 10:10:22 +01:00
Asbelos
45f690eb4d RAG Ifs and cmds 2022-04-17 09:58:32 +01:00
Asbelos
1b0d700009 Merge branch 'ThrottleInfo' into TrackManager 2022-04-12 23:16:41 +01:00
Asbelos
28a4406044 Subtle corrections 2022-04-12 23:10:29 +01:00
Asbelos
bfb88bb30a Assist notes draft & syntax tweaks 2022-04-08 16:13:15 +01:00
Asbelos
5846e0fe23 J command parsing 
JA JR JT commands parsed
EXRAIL sets hidden turnout state
HIDDEN description macro
Turnouts hidden flag bit
UNO seems OK, MEGA UNTESTED
 2022-04-08 11:41:50 +01:00
Asbelos
4c8b7f8517 Rebuild throttle info getters 
UNTESTED... create different methods to obtain throttle info without being withrottle specific.

Also implements turnout description of "*" as hidden.
 2022-04-03 11:19:04 +01:00
Asbelos
aaa3e7a83c Merge branch 'ServoSignal' into TrackManager 2022-03-31 22:20:33 +01:00
Asbelos
731d838e83 KILLALL macro 
and DIAGNOSTIC messages when KILL command used.
 2022-03-31 21:52:43 +01:00
Asbelos
f9e36e6693 Merge branch 'ServoSignal' into TrackManager 2022-03-31 10:13:53 +01:00
Asbelos
8085d03d65 </KILL ALL> fix 2022-03-31 10:11:34 +01:00
Asbelos
5adabcd1af Merge branch 'ServoSignal' into TrackManager 2022-03-28 14:56:27 +01:00
Asbelos
0040f5caf6 EXRAIL </KILL ALL> 2022-03-24 11:10:09 +00:00
Asbelos
349f5d5362 EXRAIL FORGET current loco 2022-03-24 10:40:49 +00:00
Asbelos
865c8dd3bd DCX Track mode 
And unified SET_TRACK Exrail macro
 2022-03-19 16:26:29 +00:00
Asbelos
be186b967b CODE TIDY 
Moved join code out of DCCWaveform to reduce footprint for ESP32 waveform replacement.
 2022-03-19 11:22:31 +00:00
Asbelos
cd952c6ede Merge branch 'ServoSignal' into TrackManager 2022-03-18 13:47:07 +00:00
Asbelos
367e400d75 SIGNALH, ATGTE, ATLT 
UNTESTED
 2022-03-18 13:46:07 +00:00
Asbelos
f5fb1540f0 Merge branch 'master' into ServoSignal 2022-03-18 13:43:15 +00:00
Asbelos
7e3dcb8e8c Correct merge issues from master 2022-03-07 18:46:29 +00:00
Asbelos
4437f870b6 Merge branch 'master' into TrackManager 2022-03-07 18:40:32 +00:00
Asbelos
ac3ffd2a36
Exrail BROADCAST and POWERON version 4.0.1 (#216) 
* EXRAIL BROADCAST("msg") UNTESTED

* Add POWERON to EXRAIL

* POWERON only powers main, join will do both

* Update Version 4.0.1

* Broadcast jopin after driveaway

* rollback of previous edit  line 535 WiThrottle.cpp

* restructure GetLocoCallback() for better readability and put broadcastPower() at right place

Co-authored-by: Ash-4 <81280775+Ash-4@users.noreply.github.com>
Co-authored-by: Harald Barth <haba@kth.se>
 2022-03-07 11:30:47 -05:00
Chris Mayo
fa4f5f08ef
Comment Typos (#214) 
* Example config comment typos

* Code comment typos
 2022-03-06 10:05:35 -05:00
Asbelos
dd9152864b Missing DCC startup!!! + EXRAIL POWERON catchup 2022-02-28 10:38:26 +00:00
Asbelos
99e636974a SET_TRACK_DC/SET_TRACK_DCC 
EXRAIL macros for TrackManager
SET_TRACK_DC sets the track to DC using the cab address of the current loco so you can drive..
 2022-02-24 11:50:22 +00:00
Asbelos
a7740d652d It builds.... 
massive track reorganization
 2022-02-23 15:44:34 +00:00
Asbelos
4300a3fdac UNTESTED SERVO_SIGNAL 
SERVO_SIGNAL definition in EXRAIL
SERVO_SIGNAL(vpin, redpos, amberpos, greenpos)

use RED/AMBER/GREEN as for led signals.
 2022-02-06 13:56:51 +00:00
Fred
bd7c8bf78e
Rename RMFT files and references to EXRAIL (#201) 
Make naming consistent with our marketing of ex-rail for files and defines

* Rename RMFT.h to EXRAIL.h

* Rename RMFT2.cpp to EXRAIL2.cpp

* Rename RMFT2.h to EXRAIL2.h

* Rename RMFT2MacroReset.h to EXRAIL2MacroReset.h

* Rename RMFTMacros.h to EXRAILMacros.h

* Rename RMFT references to EXRAIL
 2022-01-30 12:31:26 -05:00