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

1072 Commits

Author SHA1 Message Date
Asbelos
576288ba9e DIAG LCD 2020-10-12 22:18:09 +01:00
Harald Barth
ac0f7e9356 Merge branch 'ackdiag' into mergetest 2020-10-12 23:10:31 +02:00
Asbelos
0e3046e24f
Lcd experimental (#46)
* LCD/OLED Implementation
* OLED basic working 32
*132 display
* LCD/OLED startup ok
* Simplified setup
* Missing freememory include
* Format Width
Allow right padding number width in String format
* Intermediate scroll
* Compile issues with no LCD
* Clean buffers at startup
* Support for format left padded numbers
* Smarter Scrolling
And forced start messages
Free Ram in slot 2
* LCD tidying
Neater setup block in .ino.
Dropped unnecessary code
No-scroll if display not full
* Missing %E format support
This is used in WifiInterface checkForOK
* Wifi correction and memory guard
2020-10-12 14:32:47 -04:00
Harald Barth
1c2df3fe22 Ack current setable by debug statement D ACK LIMIT n 2020-10-08 23:39:04 +02:00
SteveT
e112be7087 Merge branch 'master' of https://github.com/mstevetodd/CommandStation-EX 2020-10-07 08:53:02 -04:00
Asbelos
3f06fb08df
Wifi reliability (#45)
* First pass at wifi inbound FSA
* Fixup detector loop
* Remove asyncBanned
Unused, uninitialized
* Move wifi setup loop out of .ino
Wifi auto detect Serial 1,2,3
* Correct capitalization
* Uno compiles clean
* Command distributor
Moved command execution routing out of Wifi code for future use by Ethernet interface.
Co-authored-by: Fred <fndecker@gmail.com>
2020-10-05 13:42:31 -04:00
Harald Barth
abd83bf7d6 Merge branch 'turnouteeprom' into mergetest, conflicts in DCC.cpp resolved
Conflicts:
	DCC.cpp
2020-10-05 00:13:04 +02:00
Harald Barth
6dc4bcdb71 D EEPROM command 2020-10-04 21:20:13 +02:00
dexslab
f0314e96af Changes for compatibility with Installer 2020-10-04 11:31:24 -04:00
dexslab
a8000aae54 Changes for compatibility with Installer 2020-10-04 11:29:48 -04:00
Harald Barth
75d7547f11 Turnouts stored to EEPROM without trashing other stuff 2020-10-03 14:07:25 +02:00
Asbelos
6feda4e217
startup Info on USB (#44)
Add status info to CS startup and ash Git SHA for version tracking
2020-10-02 12:12:48 -04:00
FrightRisk
a28792312a add back config.example.h file 2020-09-29 17:28:03 -04:00
FrightRisk
7c47bb1562 Fix Turnout and Output return value 2020-09-29 17:19:02 -04:00
mstevetodd
1b802cc600
add support for FireBox_Mk1, reduce heartbeat, separate eStop time (#43) 2020-09-29 11:51:01 -04:00
mstevetodd
6e45b3a434
Merge pull request #3 from DCC-EX/master
get upstream changes
2020-09-28 19:09:02 -04:00
SteveT
f6b5a47975 add support for FireBox_Mk1, reduce heartbeat, separate eStop time 2020-09-28 19:07:27 -04:00
Dex
2495edbd25
Merge pull request #42 from DCC-EX/feature/config
revert of timer.cpp
2020-09-28 15:15:36 -04:00
dexslab
81c695168e revert of timer.cpp 2020-09-28 15:13:48 -04:00
mstevetodd
fee0a75b36
Merge pull request #2 from DCC-EX/master
merge upstream changes
2020-09-28 14:09:20 -04:00
Harald Barth
f6853e5abd Merge branch 'progcurlimit' 2020-09-27 13:26:41 +02:00
Harald Barth
7cd9e68717 turn PROGBOOST off at PROG off 2020-09-27 13:26:29 +02:00
Harald Barth
1801366aa3 Merge branch 'progcurlimit' 2020-09-27 13:12:27 +02:00
Harald Barth
1f03d9759d cap overcurrent off time to 10sec 2020-09-27 13:12:02 +02:00
Harald Barth
85d60dfbbd D PROGBOOST ON command 2020-09-27 13:03:46 +02:00
Harald Barth
87fcfa0823 Merge branch 'progcurlimit' 2020-09-27 12:22:31 +02:00
Harald Barth
c14596a252 current trip values on PROG depending on state 2020-09-27 12:14:25 +02:00
Gregor Baues
e02f29d132 plaformio.ini with monitor flags 2020-09-27 11:03:05 +02:00
Harald Barth
6911d9ed01 better howto in README.md 2020-09-27 00:44:45 +02:00
Harald Barth
60413b00e3 platformio conf 2020-09-26 23:46:28 +02:00
Harald Barth
9917035534 PROG_TRIP_CURRENT defined here until made runtime changable 2020-09-26 23:33:47 +02:00
Harald Barth
527cc92eac Merge branch 'feature/config' into mergetest
Conflicts:
	platformio.ini
2020-09-26 23:28:02 +02:00
Harald Barth
d45d35f32f Merge branch 'feature/config-saveram' into feature/config
Conflicts:
	objdump.bat
2020-09-26 23:04:19 +02:00
Harald Barth
a91d127256 Merge branch 'feature/config-saveram' of https://github.com/DCC-EX/CommandStation-EX into feature/config-saveram 2020-09-26 22:57:34 +02:00
Harald Barth
00202e7966 remove unused configs 2020-09-26 22:56:35 +02:00
Fred
59383dd6d5
Update platformio.ini
Update platformio build check to include the Ethernet and SPI libraries for a mega when ethernet is used
2020-09-26 16:52:13 -04:00
Harald Barth
79201a911c fix objdump.sh 2020-09-26 22:28:29 +02:00
Fred
6fb11d5ac9
Update platformio.ini
Add dependency for Ethernet library for Mega
2020-09-26 15:06:27 -04:00
Fred
36a59c5c8a
Update platformio.ini
Add dependency for Ethernet library for Mega
2020-09-26 15:03:22 -04:00
Fred
c52610ae9c
Update platformio.ini 2020-09-26 14:55:19 -04:00
Fred
2929ce167b
Update platformio.ini
Add Ethernet library dependency when that is enabled
2020-09-26 14:34:59 -04:00
Asbelos
38fe65fcca Drop advanced feature samples from basic ino 2020-09-26 16:29:11 +01:00
Asbelos
c3e17fcf04 Add EthernetInterface (UNTESTED, UNCALLED)
Thanks to Gregor....I have modified his originals to eliminate the static initialisation memory loss. These do not show up in the object code if they are not referenced.
2020-09-26 12:01:00 +01:00
Asbelos
36e6c3cd48 Decouple WifiInterface from Parser
This removes the need for WifiInterfrace <+> command processing to be included in the link. so parser does not need to see the config settings for wifi.
If Wifi doesnt set the At command callback, parser will return <X> for a <+> command
2020-09-26 10:54:11 +01:00
Asbelos
162c7e6e11 UNTESTED Reduce #ifdef hell on wifi
This fix to the structure of the Wifi code alows for a better link optimisation and so it is no longer necessary for the wifi code or header to read values from the config.h file.

Compilation shows that >11Kb of code is eliminated by the linker if the setup and loop are not called.
~including the interface does not really change anything
2020-09-26 09:40:49 +01:00
Asbelos
411a6b1130 Move bulk includes out of .ino
I left config.h in the .ino so it shows the user that this will be necessary.
2020-09-26 08:49:51 +01:00
Asbelos
59d77f2362 Remove unnecessary #iddefs
These are only avoiding files that alrerady self-destruct... so they don't need to be avoided.
2020-09-26 08:42:24 +01:00
Asbelos
f76fb8d6c5 Merge branch 'feature/config' of https://github.com/DCC-EX/CommandStation-EX into feature/config 2020-09-26 08:10:55 +01:00
Asbelos
9ebe13828a Correct objdump 2020-09-26 08:10:43 +01:00
Harald Barth
bff7555102 NUM_SERIAL tells us how many serial lines to check 2020-09-25 22:49:53 +02:00