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

116 Commits

Author SHA1 Message Date
Asbelos
36e38bf861 AYSNC prog cmds from Wifi/Ethernet
prog track commands from wifi/ethernet will no longer block loop while waiting
for ACK
2021-03-08 10:40:32 +00:00
Fred
4861e592c7
Nano every2 (#129)
* Start adding back unowifi stuffz

* Uno Wifi compiling

* Fixes for compile arduino unowifi r2

* FlasString and Timers for Uno Wifi

ALL these changes should be portable back to master

* Remove extra timer that was already added

* Changed to EveryTimerB

* Add everytimerb.h

* Cleanup

* Linear address <a> cmd

* Allow lower case keywords

* Add the F define to be on safe side if it is not present in the library core code

* Clean simple Timer interface

Removes overkill files, puts all timer in a single small file. (DCCTimer)

* Timer port

* Timer working

And slow wave command removed

* Correcting non-portables merged from master

* Wave-state machine ( part 11)

* Microtuning waveform

Significant reduction in code paths and call overheads

* Current check cleanup

* Fix no-loco id

Has to handle -1 correctly

* fix wrong format letter

* redo flow through wifisetup again

* version++

* bugfixes wifi setup

* Retry harder for AP mode

* Remove unued if

* DIO2 replacement

Currently for writing signal pins during waveform.

* Drop analogReadFast (see DCCTimer)

AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver

* UNTESTED fast power,brake,fault pins

* Distunguish between in/out of FASTPIN

* minor performance tweaks

* Config comments and example use

* Config/example loading

* IP/PORT on LCD

* Ethernet simulated mac

Plus fixed listening port

* Github SHA

* Committing a SHA

* Fix for nano compile

* Comments and a reliability fix.

* UnoRev2 protection

* PWM pin implementation

* fix wifi setup issue

* Reinstate IP_PORT

* Wifi channel and code cleaninga

* Reduce duplicated F() macros

Compiler isn't as clever as one might expect

* Committing a SHA

* Update config.example.h

Add comment to wifi channel section

* Committing a SHA

* Handle shields with common fault pins (Pololu)

* Committing a SHA

* remove warning

* Committing a SHA

* only do the sha generation on master

* yaml syntax

* Fast SSD1306 OLED driver

Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.

* Fix auto-configure from cold boot.

Add call to Wire.begin().

* Update comment for OLED_DRIVER define.

* Update MotorDrivers.h

Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.

* Committing a SHA

* Fix missing F  in motor drivers

* JOIN relay pin

* Swap Join Relay high/low

* Hide WIFI_CONNECT_TIMEOUT

This is not what the config suggests it is...  The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.

* Enhance OLED/LCD speed

Write one character or position command per loop entry so as not to hold up the loop.  Add support for SH1106 OLED as 132x64 size option.

* Enhance OLED/LCD speed

* Delete comment about OLED on UNO.

* Trim unwanted code

* Handle display types correctly

* Update comments

* Speed up OLED writes

Add new flushDisplay() to end any in-progress I2C transaction.  Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.

* Comments and copyright update

* Reduce RAM and flash requirement a few more bytes.

* Move statics into LCDDisplay class, and reduce RAM.

Some state variables were static in LCDDisplay.write().  Moved to class members.  Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.

* Type lcdCols and lcdRows to unsigned.

Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.

* remove timeout from user config

* faultpin is common only if it exists ; make code prettier

* Rationalisation of SSD1306 driver

Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.

* Fix some font attributes as const.

* Remove unused initialisation sequences for tiny oled screens

* Add m_ to variables

* Bump up I2C speed

Speed was 100kHz (default).  Max for OLEDis 400kHz.

* Revert "Bump up I2C speed"

This reverts commit 1c1168f433.

* Bump up I2C speed

Speed was 100kHz (default). Max for OLEDis 400kHz.

* Drop duplicate DIAG

* ignore mySetup.h files

* Restore uno to default_envs

Restore uno (previously commented out) to default_envs.

* Update objdump.bat

Allows other editors as Notepad is very slow on large files

* Prog Track overload during cv read

* Faster LCD Driver

Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.

* Update config.example.h

Add IBT_2_WITH_ARDUINO to example config

* Update config.example.h

* Screen enhancements (#126)

* Add I2CManager to coordinate I2C shared parameters.

* Add use of I2CManager, and experimental scrolling strategies.

New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line).  If not defined, defaults to 0.

* Scrolling updates

New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.

* Add I2CManager calls. Remove unnecessary delays.

* Add I2CManager calls, remove unnecessary I2C delays.

* SSD1306: Move methods from .h to .cpp and reformat.

* Fix compiler warning in LiquidCrystal_I2C

* Allow forcing of I2C clock speed.

New method forceClock allows the I2C speed to be overridden.  For example, if the I2C bus is long then the speed can be forced lower.  It can also be forced higher to gain performance if devices are capable.

* Make Config.h conditionally included.

Allow for non-existence of Config.h.

* Correct scrolling and allow longer messages

Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed.  Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.

* compiler warning on uno

Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 15:58:35 -05:00
Harald Barth
0b3e904ffb correct logic in setLocoId 2021-01-30 22:53:05 +01: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
Asbelos
742f10bf0a Merge branch 'master' into wifi-reliability2 2020-10-20 12:31:52 +01:00
Harald Barth
7dca6db1c5 Bit shuffling for function groups 2020-10-13 23:08:19 +02:00
Asbelos
3fe04c1a0e DCC getFn 2020-10-12 22:18:55 +01: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
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
Harald Barth
85d60dfbbd D PROGBOOST ON command 2020-09-27 13:03:46 +02:00
Asbelos
b6b8bfb04d Fix Auto-poweron in blocking mode 2020-09-25 12:37:30 +01:00
Harald Barth
812cee364f compiler warning 2020-09-24 11:06:57 +02:00
Asbelos
caef013d35 Supply motor shield name for <s> 2020-09-24 09:51:09 +01:00
Asbelos
59febed37d <V> commands
UNTESTED
2020-09-18 00:04:42 +01:00
Asbelos
a86b65ced0 Auto prog power diagnostics and cleanup 2020-09-11 12:56:36 +01:00
Asbelos
39d9defec6 Improved <D> commands
<D ACK 1|0>
<D WIFI 1|0>
<D WIT 1|0>
<D CMD 1|0>
<D CABS>
<D RAM>
2020-09-10 13:09:32 +01:00
Harald Barth
d3506583d5 remove unused POWER* opcodes 2020-09-08 22:15:42 +02:00
Harald Barth
7a008938ec autopower on/off merged into BASELINE and exit codes 2020-09-08 22:14:05 +02:00
Harald Barth
ad4928043c Revert "Use POWERON/OFF in progs"
This reverts commit f3ac7fa403.
2020-09-08 21:39:54 +02:00
Harald Barth
0582d939c5 Fastfail if no CV there 2020-09-08 10:12:40 +02:00
Harald Barth
f3ac7fa403 Use POWERON/OFF in progs 2020-09-08 10:00:59 +02:00
Harald Barth
5c775531f6 Introduce POWERON and POWEROFF opcodes 2020-09-08 09:47:40 +02:00
Harald Barth
665a540a73 checkResets takes numResets argument 2020-09-08 09:24:37 +02:00
Asbelos
fd466a5e62 Broadcast stop/estop
Avoids directuion change in reminders
2020-09-03 11:28:52 +01:00
Asbelos
31651d3e44 Optional Timer number override 2020-08-28 12:34:58 +01:00
Asbelos
da7275d9a4 Motor drivers tested 2020-08-17 15:30:25 +01:00
Asbelos
cdcb01d300 Compiled motorDriver
New motorDriver design...
2020-08-15 11:32:32 +01:00
Asbelos
a217031f24 Withrottle in use change 2020-08-14 12:26:14 +01:00
mstevetodd
ecbedd26bc withrottle changes
disallow acquire if address in use
return error on address 0 and mismatched L/S
move init string to 'HU' reply
some message format fixes
comment-out some DIAGs to show only in and out message traffic
2020-08-12 11:17:05 -04:00
Harald Barth
7c94a3c881 comments and constant as unsigned 2020-08-01 15:03:15 +02:00
Harald Barth
93446f19ed Two functions changeFn and setFn dependent on if called from WiThrottle or DCCEXparser 2020-08-01 14:06:39 +02:00
Harald Barth
926968bbd7 Function toggle but F2 2020-08-01 00:35:22 +02:00
Asbelos
a915331103 Emergency stop in JMRI and WiThrottle
JMRI -1 means speed=1 in DCC
2020-07-23 15:41:43 +01:00
Asbelos
2ae7aedcd2 Blocking progtrack call optoin
Note, as yet UNTESTED
2020-07-19 18:39:08 +01:00
Asbelos
a245b9d119 Prog-Track-As-Siding 2020-07-12 00:11:30 +01:00
Asbelos
ff881790ac Increase PROG repeats
refer @grbba
2020-07-11 09:35:57 +01: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
Asbelos
46d1f3e237 Copyrights etc 2020-07-03 17:35:02 +01:00
Asbelos
b0debd1fab Interrupt time ACK manager 2020-07-02 12:49:35 +01:00
Asbelos
47a4d2dae9 Cleanup and ACK debugs 2020-07-01 16:58:48 +01:00
Asbelos
bec57345f1 ACK diagnostics
Type <D 1> to enable
2020-07-01 10:27:53 +01:00
Asbelos
20e8715fc6 WiThrottle ACTUALLY WORKS 2020-06-29 13:03:08 +01:00
Asbelos
669356df7d First WiThrottle prototype 2020-06-27 15:36:32 +01:00
Asbelos
030cb654b4 Accessory command validations 2020-06-23 20:00:34 +01:00
Asbelos
cc0821520e Implement function reminders and new function API 2020-06-22 10:54:57 +01:00
Asbelos
5872659ff2 Command Filter and some extra APIs. 2020-06-18 19:36:37 +01:00
Asbelos
ffea04a499 tIMER WRAP PROTECTION and broadcast speed fix 2020-06-16 11:06:36 +01:00
Asbelos
4d80152ad0 ACK Timer correction 2020-06-09 08:38:27 +01:00
Asbelos
50cbcabe00 ACK pulse timins refer @haba 2020-06-09 08:35:14 +01:00
Asbelos
f8f4268a48 Get loco Id API test 2020-06-08 13:04:47 +01:00
Asbelos
f2ee681479 Improved average CV read time
Anticipate more zeros than 1s in a typical CV value
2020-06-07 17:02:22 +01:00
Asbelos
d1843fe38e Ack updates and diags commented out
ACK logic now seems to work.
2020-06-07 16:29:53 +01:00
Asbelos
026ee0b7a8 Working ACKs with diagnostics 2020-06-07 15:29:09 +01:00
Asbelos
0ad395a63a Ack Management compiles
but remains untested
2020-06-07 13:48:42 +01:00
Asbelos
d42589aff5 Loco reminders speedcode
Saves one byte per loco and avoids recalculating the speed message bits each time
2020-06-03 10:36:01 +01:00
Asbelos
26dffa3be3 Added DCC api readCVBit and getLocoId
Sanity check needed
2020-06-03 09:42:17 +01:00
Asbelos
23f15131a8 DCC API file tidying
Cruft removal and replace (most) DCC message codes with named constants.
2020-06-01 13:56:02 +01:00
Asbelos
257a81f969 Throttle fix 2020-05-29 15:44:57 +01:00
Asbelos
54ef92085b Include file ckleaning 2020-05-27 09:40:12 +01:00
Asbelos
864d2936b1 Acks 2020-05-26 18:34:54 +01:00
Asbelos
22406b44ed Abstracted Hardware Interface
The hardware interface for all pins and timers is now in Hardware.cpp
2020-05-26 12:44:02 +01:00
Asbelos
28be07610a Better diagnostics 2020-05-26 09:44:20 +01:00
Asbelos
54e1284e01 Implemebnt DCC API layer 2020-05-24 16:07:16 +01:00