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

829 Commits

Author SHA1 Message Date
mstevetodd
ae6958b636
Merge pull request #20 from DCC-EX/master
merge upstream changes
2021-02-15 20:25:51 -05:00
Harald Barth
781d0325af Committing a SHA 2021-02-15 09:52:46 +00:00
Harald Barth
62d1f46a03 yaml syntax 2021-02-15 10:52:19 +01:00
Harald Barth
5860ad3f1d do the sha generation on master 2021-02-15 10:41:08 +01:00
mstevetodd
8aacb6dc5c
Merge pull request #19 from DCC-EX/master
merge upstream changes
2021-02-10 10:52:28 -05:00
Fred
92fb06c691
Rename release-notes.md to release_notes.md 2021-02-07 12:43:15 -05:00
Fred
bf52f99a3a
Create release-notes.md
Add release notes to main sketch folder
2021-02-07 12:41:03 -05:00
mstevetodd
336a6479e4
Merge pull request #18 from DCC-EX/master
merge upstream changes
2021-02-02 19:58:28 -05:00
Harald Barth
6cc5550927 result should be as is (can be -1 to indicate fail) 2021-01-30 22:54:38 +01:00
Harald Barth
0b3e904ffb correct logic in setLocoId 2021-01-30 22:53:05 +01:00
Fred
f646f12c65
Update Prod-Release-Notes.md 2021-01-21 10:19:34 -05:00
Fred
a91dc98184
Update Prod-Release-Notes.md 2021-01-21 10:13:38 -05:00
Fred
7c7305ba1d
Update Prod-Release-Notes.md 2021-01-21 10:08:35 -05:00
Asbelos
3818a16808
Merge pull request #121 from DCC-EX/ConsistR
Startup commands and < R > and < W > commands
2021-01-21 11:16:15 +00:00
Asbelos
2ce4c8066e Update version.h 2021-01-21 11:10:52 +00:00
Asbelos
d71c95e9d2 Merge branch 'master' into ConsistR 2021-01-21 11:09:09 +00:00
Asbelos
fa2b740bb4 Merge branch 'startupCommands' into ConsistR 2021-01-21 11:00:01 +00:00
mstevetodd
271d453b99
Merge pull request #17 from DCC-EX/master
add warn/trip level to meter response (#120)
2021-01-19 14:55:06 -05:00
mstevetodd
611838d60c
add warn/trip level to meter response (#120)
* send milliAmps and meter setup for new JMRI Meter function

* add warn/trip level to meter response

provides support for separate max vs trip levels
2021-01-18 17:46:41 -05:00
SteveT
de4bf42923 add warn/trip level to meter response
provides support for separate max vs trip levels
2021-01-18 09:14:41 -05:00
Asbelos
7d90e4241a Add <W locoid> command
Automatically clears consist and manages short/long addresses
2021-01-18 10:06:46 +00:00
Asbelos
b537d7a318 <R> command consist support
R command will return address suitable for throttle if consist has been setup.
2021-01-17 13:22:16 +00:00
mstevetodd
bf97adfe2d
Merge pull request #16 from DCC-EX/master
pull upstream changes
2021-01-11 17:10:53 -05:00
Fred
82a4b48808
Update Prod-Release-Notes.md 2021-01-08 17:03:43 -05:00
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