1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-27 10:06:13 +01:00
Commit Graph

705 Commits

Author SHA1 Message Date
Fred
7b4e5546b6
Update version.h 2021-01-08 16:58:22 -05:00
mstevetodd
418d8eb1b2
send milliAmps and meter setup for new JMRI Meter function (#113)
* send milliAmps and meter setup for new JMRI Meter function
2021-01-08 16:57:32 -05:00
Asbelos
895b2aaaaa Implement mySetup.h facility 2021-01-07 20:58:23 +00:00
SteveT
f1116ffba4 send milliAmps and meter setup for new JMRI Meter function 2021-01-06 16:27:14 -05:00
SteveT
da31e9cbc5 send milliAmps and meter setup for new JMRI Meter function 2021-01-06 16:13:58 -05:00
SteveT
7f27cfc9cb send milliAmps and meter setup for new JMRI Meter function 2021-01-06 16:09:26 -05:00
SteveT
e7ada19c97 send milliAmps and meter setup for new JMRI Meter function 2021-01-06 16:05:31 -05:00
mstevetodd
ad72e2f697
Merge pull request #15 from DCC-EX/master
pull upstream changes
2021-01-06 15:32:11 -05:00
Fred
0618a0bd72
RMFT Hooks (#112)
These hooks do NOT require RMFT code to be present.... but they offer the hooks that RMFT will need when available.

authored-by: Asbelos <asbelos@btinternet.com>
2021-01-05 13:05:17 -05:00
mstevetodd
42075f838e
<T> should send turnout definitions, not just states (#110)
* use int, not byte for witSpeed

* add turnout, sensor and output states to 's'tatus message

* <T> should send turnout definitions, not just states
2021-01-04 10:57:03 -05:00
SteveT
98d6ff7709 undo inadvertent commit 2020-12-28 21:02:04 -05:00
SteveT
7e7435eafa <T> should send turnout definitions, not just states 2020-12-28 21:00:18 -05:00
mstevetodd
f134d87c85
Merge pull request #14 from DCC-EX/master
merge upstream changes
2020-12-28 19:48:47 -05:00
ADA
d70f76e80e
Adanrg ethernet shield fixes (#107)
* Ethernet Shield can be configured with static IP

* Use MAC address in config.h, if configured.

* Fix library name typos

* Update EthernetInterface.h

Remove MAC address define here and remind people with a compile time error that it must be defined in the config.h

Co-authored-by: Fred <fndecker@gmail.com>
2020-12-27 18:06:31 -05:00
Fred
7963b02839
Update config.example.h
Modify example config for Ethernet Shield use
2020-12-27 17:27:22 -05:00
Asbelos
c8bf4347c2
Update DCCWaveform.cpp (#109)
Anti-jitter
Prevents main track interrupt taking a variable time which causes prog track jitter.
2020-12-27 16:41:00 -05:00
Harald Barth
883ac61fc7 spell names like on github 2020-12-27 21:43:05 +01:00
mstevetodd
5ee59e5f4b
Merge pull request #13 from DCC-EX/master
merge from upstream
2020-12-27 12:28:57 -05:00
Fred
fd6784a2c2
Update Prod-Release-Notes.md 2020-12-27 10:48:17 -05:00
Fred
b674869427
Update Prod-Release-Notes.md 2020-12-27 10:43:17 -05:00
Fred
a34b51a63d
Update Prod-Release-Notes.md
Fix formatting.
2020-12-27 10:41:14 -05:00
Fred
72aa0f2c2b
Update Prod-Release-Notes.md 2020-12-27 10:38:51 -05:00
mstevetodd
9d92fd9451
add turnout, sensor and output states to 's'tatus message (#108)
* add support for FireBox_Mk1, reduce heartbeat, separate eStop time

* make match master

* make match master

* Update defines.h

* FIX: return WiThrottle speedstep, not DCC speedstep, in response to speed change request.

Should close #104

* use int, not byte for witSpeed

* add turnout, sensor and output states to 's'tatus message
2020-12-27 10:20:11 -05:00
SteveT
bc14cb176f add turnout, sensor and output states to 's'tatus message 2020-12-23 20:01:11 -05:00
mstevetodd
0fee057b1b
Merge pull request #12 from DCC-EX/master
Update Prod-Release-Notes.md
2020-12-23 09:38:54 -05:00
Fred
5f21716055
Update Prod-Release-Notes.md
Add Matt H, a reference to WebThrottle-EX and add more feature notes
2020-12-21 20:12:47 -05:00
mstevetodd
f26f5ab40b
Merge pull request #11 from DCC-EX/master
Add LCD and OLED libs (#102)
2020-12-18 09:02:42 -05:00
ggee
040dc35b93
Add LCD and OLED libs (#102)
Add the example platformio configuration file
2020-12-17 17:33:29 -05:00
mstevetodd
9d0dbf7878
Merge pull request #10 from DCC-EX/master
merge upstream changes
2020-12-16 11:39:23 -05:00
Harald Barth
e1ad1f0ced Merge branch 'ethernetdefine' 2020-12-11 23:24:26 +01:00
Harald Barth
a1b802d91b Merge branch 'currentvalues' 2020-12-11 22:04:39 +01:00
Harald Barth
5333b7889f bugfix patches go in now 2020-12-11 22:02:11 +01:00
Harald Barth
fd292e50b6 Merge branch 'wifispeed' 2020-12-11 22:01:01 +01:00
mstevetodd
b9fdfdd71c
FIX: return WiThrottle speedstep, not DCC speedstep, in response to speed change request (#105)
* FIX: return WiThrottle speedstep, not DCC speedstep, in response to speed change request.

Should close #104

* use int, not byte for witSpeed
2020-12-11 14:20:13 -05:00
SteveT
47641a4b01 use int, not byte for witSpeed 2020-12-11 13:29:55 -05:00
Harald Barth
89073bd311 give back witspeed not converted (DCC) locospeed 2020-12-11 19:11:17 +01:00
Harald Barth
73b5325085 better speed step comment 2020-12-11 19:03:05 +01:00
SteveT
ef95e98a44 FIX: return WiThrottle speedstep, not DCC speedstep, in response to speed change request.
Should close #104
2020-12-11 09:33:18 -05:00
mstevetodd
8803dc0ea3
Merge pull request #9 from DCC-EX/master
Create CONTRIBUTING.md
2020-12-11 08:59:00 -05:00
Fred
d67290b579
Create CONTRIBUTING.md
Create a contributing file
2020-12-08 07:34:59 -05:00
Harald Barth
a1f7d06508 Report current as 1/1024 as expected by JMRI 2020-12-06 21:43:37 +01:00
Harald Barth
01a6d1c8f4 Ethernet should need a #define in config(.example).h 2020-11-29 10:48:39 +01:00
mstevetodd
3ae8ce30ff
Merge pull request #8 from DCC-EX/master
pull upstream commits
2020-11-26 19:41:25 -05:00
Harald Barth
f2db288102 Merge branch 'ackdiag' into candidate 2020-11-26 16:20:34 +01:00
Harald Barth
89fd98e4af Merge branch 'pluscommand-trackpoweroff' into candidate 2020-11-26 16:20:18 +01:00
Harald Barth
c57add11e3 Merge branch 'wifitimeout' into candidate 2020-11-26 16:17:17 +01:00
Harald Barth
21b3d28038 Merge branch 'master' into candidate 2020-11-26 15:58:40 +01:00
Harald Barth
e4eecae846 do not touch CR or CRLF of svg files 2020-11-26 15:55:52 +01:00
LarryD
56569a9b44
Partially fixed alignment issue. 2020-11-25 19:02:14 -06:00
mstevetodd
abfd63eb0d
Merge pull request #7 from DCC-EX/master
pull upstream changes
2020-11-25 19:57:29 -05:00