1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 21:01:25 +01:00
Commit Graph

2416 Commits

Author SHA1 Message Date
Asbelos
cb4d9823b5
Merge pull request #4 from Asbelos/overcurrent-sense
Overcurrent sense
2020-07-12 18:54:15 +01:00
Harald Barth
0d0f591d29 revert Config.h to standard 2020-07-12 16:38:06 +02:00
Harald Barth
f3eea33f06 Merge branch 'tinker2-mega' into mergefix-2
Conflicts:
	Config.h
	DCCEXParser.cpp
	DCCWaveform.cpp
	DCCWaveform.h
	Hardware.cpp
2020-07-12 16:25:16 +02:00
Harald Barth
22d4fcf3b8 more ifdefs 2020-07-12 16:03:22 +02:00
Harald Barth
9b04e7dfd6 Merge branch 'hash' into mergefix 2020-07-12 15:40:19 +02:00
Asbelos
98ce3ae5d2
Merge pull request #3 from Asbelos/hash
Hash
2020-07-12 08:58:43 +01:00
Harald Barth
8f47311cbc Merge branch 'hashcommand' into hash 2020-07-12 01:49:51 +02:00
Harald Barth
0583fac416 Expotential overcurrent handling #1 2020-07-12 01:36:56 +02:00
Asbelos
a245b9d119 Prog-Track-As-Siding 2020-07-12 00:11:30 +01:00
Asbelos
2fbbbfc8bd Parse with < bug 2020-07-12 00:08:50 +01:00
Asbelos
ff881790ac Increase PROG repeats
refer @grbba
2020-07-11 09:35:57 +01:00
Asbelos
333410c368 Change PROG current detect during ACK 2020-07-11 09:06:34 +01:00
Harald Barth
9d9c6edc2f Pololu on Mega seems OK 2020-07-10 01:03:47 +02:00
Asbelos
e27c176fdf No reminders for F13-F28 2020-07-05 21:24:54 +01:00
Asbelos
4aceff8b7c WiThrott;e FIXES 2020-07-05 21:00:27 +01:00
Harald Barth
0a3d2e7595 Implement # command 2020-07-04 21:53:44 +02:00
Harald Barth
e244de7835 more merge 2020-07-04 21:44:36 +02:00
Harald Barth
ac3c8661a6 more merge 2020-07-04 21:40:08 +02:00
Harald Barth
90e4f3ea19 Merge branch 'master' into mergefix
Conflicts:
	DCCWaveform.cpp
2020-07-04 21:36:05 +02:00
Harald Barth
cecbc62e73 Sense factor corr 2020-07-04 21:32:21 +02:00
Asbelos
a2636b1296 ACK pulse durations
Refer @haba
2020-07-03 17:57:24 +01:00
Asbelos
dc33acf7d4 Update WiThrottle.cpp 2020-07-03 17:35:32 +01:00
Asbelos
46d1f3e237 Copyrights etc 2020-07-03 17:35:02 +01:00
Asbelos
dc13a0e209 Update DCCWaveform.cpp 2020-07-03 17:12:53 +01:00
Harald Barth
e0dbe06939 Merge branch 'tinker2-uno' into mergefix
Conflicts:
	Config.h
	DCCWaveform.h
	Hardware.cpp
2020-07-03 16:17:28 +02:00
Harald Barth
0c9b2d962b Correct place for checkAck() so ack pulse lenth is correct 2020-07-03 16:03:10 +02:00
Harald Barth
3d7a9500cf First test on Uno 2020-07-03 00:19:59 +02:00
Asbelos
53769205e4 OOps current detect wrong 2020-07-02 19:13:08 +01:00
Asbelos
505a8346d8 Current detector factors 2020-07-02 17:54:09 +01:00
Asbelos
b0debd1fab Interrupt time ACK manager 2020-07-02 12:49:35 +01:00
Asbelos
5a23fc717f currecting unused pin 2020-07-02 08:04:38 +01:00
Asbelos
9ebe4ad834 Update WifiInterface.cpp 2020-07-01 23:02:45 +01:00
Asbelos
47a4d2dae9 Cleanup and ACK debugs 2020-07-01 16:58:48 +01:00
dexslab
4721c7150c Add readme add back extensions and settings from Dave and fix gitignore 2020-07-01 09:06:03 -04:00
Asbelos
bec57345f1 ACK diagnostics
Type <D 1> to enable
2020-07-01 10:27:53 +01:00
Dex
6903995d6d
Create CI workflow for Command Station 2020-06-30 22:54:03 -04:00
dexslab
9c6ca904a0 File structure changes to allow installer compile, fixes for gitignore 2020-06-30 22:50:47 -04:00
Asbelos
5269177f2e Clearing up more warnings
NOTE: the ones in MemStream are not mine!
2020-06-30 09:09:39 +01:00
Asbelos
7f7d707bc9
Merge pull request #1 from mstevetodd/master
add server type message (HT) to initial connection strings, fix link
2020-06-30 08:13:44 +01:00
mstevetodd
2f442df82f
add server type message (HT) to initial connection strings 2020-06-29 20:16:22 -04:00
mstevetodd
f2db8768a6
fix link (and test PR) 2020-06-29 08:49:46 -04:00
Asbelos
59e541de72 Quit/Reconnect improvements 2020-06-29 13:45:16 +01:00
Asbelos
20e8715fc6 WiThrottle ACTUALLY WORKS 2020-06-29 13:03:08 +01:00
Asbelos
6a923c4302 Cleaning up warnings (some of which were actually fatal) 2020-06-29 11:37:05 +01:00
Asbelos
68f47dae17 HTTPParser framework
Beware needs uplifted wifi buffer
2020-06-28 12:45:31 +01:00
Asbelos
c97d07608b Surface Wifi setup into main prog setup()
Allows for setup with a UNO
2020-06-28 10:21:27 +01:00
David Cutting
0bfeefca37 Change configuration, rename FireBox 2020-06-28 00:28:08 -06:00
Asbelos
669356df7d First WiThrottle prototype 2020-06-27 15:36:32 +01:00
Asbelos
1a1429bf72 Servo Turnouts 2020-06-23 20:01:43 +01:00
Asbelos
030cb654b4 Accessory command validations 2020-06-23 20:00:34 +01:00