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

113 Commits

Author SHA1 Message Date
Asbelos
0947467bfa Correct functionmap length
And remove withrottle replies that would be generated by the broadcast.
2021-12-15 20:53:55 +00:00
Asbelos
2ddf583fbc Merge branch 'Broadcast' into EXRAILPlus 2021-12-15 19:59:59 +00:00
Asbelos
bb2c85d973 Merge branch 'master' into EXRAILPlus 2021-12-15 19:56:55 +00:00
Asbelos
b0c9806f3b Withrottle broadcast functions and speeds 2021-12-15 19:51:01 +00:00
Asbelos
4a8065d33b Turnout Descriptions
UNTESTED
Also allows alias inside EXRAIL
Allows self-guarded code
Ignores EXRAIL and ENDEXRAIL keywords as unnecessary.
2021-11-27 11:29:26 +00:00
Harald Barth
43538d3b32 smaller code 2021-11-26 19:32:45 +01:00
Harald Barth
3bddeeda3e better long/short addr handling under <R>; configurable long/short border 2021-11-25 00:10:11 +01:00
Neil McKechnie
fd36ca2b92 Restructure Turnout class.
Turnout class split into a base class for common code and specific subclasses for Servo, DCC, VPIN and LCN turnouts.
Interface further narrowed to reduce direct access to member variables.
Turnout creation command handling has been moved into the DCCEXParser class.
Turnout function and parameter names changed to make the Throw and Close functionality explicit.
Turnout commands <T id C> (close) and <T id T> (throw) added.
2021-08-19 21:22:59 +01:00
Asbelos
36f6e2f9ce Narrowing Turnout publics 2021-08-18 18:55:22 +01:00
Asbelos
552e1bf3d8 Merge remote-tracking branch 'origin/RCN-213' into EX-RAIL 2021-08-17 19:48:06 +01:00
Asbelos
edefd638f1 Handoff immediately after acquire 2021-08-17 18:32:11 +01:00
FrightRisk
5eff4c5ee5 Squash all commits on RMFT branch to create EX-RAIL branch 2021-08-03 17:12:25 -04:00
Harald Barth
4f0c80a503 Turnout states according to RCN-123 where Thrown is 0 and Closed is 1. Additional protection against invalid chars in protocol 2021-07-16 10:24:11 +02:00
Mike S
136e993418 Changed to Continuous analogReads for Teensy 2021-03-27 07:17:47 -04:00
Asbelos
85a2b9231b <* *> wrapped diags
And lots of \n cleanups.
2021-03-25 14:23:38 +00:00
Asbelos
cec26c47e2 Catch up with Steves change 2021-03-12 10:38:30 +00:00
Asbelos
c51b445e41 unjoin automatically 2021-03-11 13:35:47 +00:00
Asbelos
4f7d3a5cfc ED Drive away from prog track featuire 2021-03-09 20:44:44 +00:00
mstevetodd
79a318b455
fix initial fn strings, return value of F16-F28 (#132)
* Committing a SHA

* fix initial fn strings, return value of F16-F28
2021-03-08 21:46:08 -05: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
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
Asbelos
b7fc055953 Passing Strteamer correctly
Previous method copied entire buffer!!!!
2020-10-26 13:58:25 +00:00
Asbelos
8ff947f895 Passing outbound Ring to Withrottle
This will allow Withrottle to send to other clients and broadcast messages.
2020-10-26 13:31:51 +00:00
Asbelos
ae77c5b7d6 Send all functions 2020-10-13 18:01:11 +01:00
Asbelos
11e22c5d1d Working Wifi ringbuffer implementation
Notice 1kb output buffer
Aslo no need to copy command in Withrottle
2020-10-13 17:37:40 +01:00
Asbelos
b98c853a1b Withrotthe Functions 2020-10-12 22:24:37 +01: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
mstevetodd
1b802cc600
add support for FireBox_Mk1, reduce heartbeat, separate eStop time (#43) 2020-09-29 11:51:01 -04: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
Asbelos
d3b486a071 Steves Withrottle stuff 2020-08-20 17:16:47 +01:00
SteveT
b03776c6f8 sync power state and turnout list/states to all clients 2020-08-14 21:10:02 -04:00
SteveT
a7da30b236 turnout list improvements 2020-08-14 20:46:33 -04:00
SteveT
379bf3bc0c reenable address sharing 2020-08-14 10:43:35 -04:00
Asbelos
a217031f24 Withrottle in use change 2020-08-14 12:26:14 +01:00
mstevetodd
68255dcadd drop any acquired locos on Q(uit), reduce heartbeat to 2s
also some indentation fixes
note that 2s heartbeat works best with next version of ED.
2020-08-13 16:38:22 -04:00
SteveT
5256c1d021 return new speed and dir to client, add timestamp to DIAG 2020-08-12 21:39:57 -04:00
SteveT
52b0502776 set initial direction forward, forget locos on 2nd missed heartbeat 2020-08-12 15:10:51 -04: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
mstevetodd
9cc8843e15
move ssid and password to config.h, restore timeout to full value (#5)
* Update WiThrottle.cpp

I don't believe the /2 is needed. The clients are already expected to provide a bit of extra time for the heartbeat to occur. EngineDriver targets 90% of the heartbeat. I believe WiThrottle does as well.

* move ssid and password into config.h

* Revert "move ssid and password into config.h"

This reverts commit be96b44e88f8b07ac3193dc88ce219d17fa0b43a.

* move ssid and password to config.h
2020-08-01 17:33:10 +01: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
Harald Barth
4fce31158f The auto create turnout feature should be there 2020-07-31 12:46:16 +02:00
Harald Barth
11395dde2b Merge branch 'master' into progasmain
Conflicts:
	WiThrottle.cpp
2020-07-30 17:14:25 +02:00
Asbelos
45863a043f Withrottle Heartbeat
Dont allow millisecond delays to triigger heartbeat missed
2020-07-30 15:31:31 +01:00
Harald Barth
b886a09f82 Autocreate turnouts 2020-07-25 18:50:23 +02:00
Asbelos
3aff6230a2 Reject unknown turnouts 2020-07-25 17:33:39 +01:00
Asbelos
34dde6fe12 Withrottle power at start 2020-07-25 01:40:45 +01:00
Asbelos
6fadd18827 Allow left/right turnout labels WiThrottle
TPL assist
2020-07-24 17:29:48 +01:00
Asbelos
575b5da606 WiThrottle turnout improvement 2020-07-23 17:34:35 +01: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
7eae489b9e Withrottle format char wrong 2020-07-23 12:48:58 +01:00
Asbelos
928a9d834a AT command version
+ Withrottle minor fix
2020-07-22 15:14:07 +01:00
Asbelos
0856164837 Cleaned out warnings 2020-07-16 16:10:27 +01:00
Asbelos
6ae855235f Wifi timeout on non-blocking responses 2020-07-16 13:19:29 +01:00
Asbelos
4aceff8b7c WiThrott;e FIXES 2020-07-05 21:00:27 +01:00
Asbelos
dc33acf7d4 Update WiThrottle.cpp 2020-07-03 17:35:32 +01:00
Asbelos
5269177f2e Clearing up more warnings
NOTE: the ones in MemStream are not mine!
2020-06-30 09:09:39 +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
669356df7d First WiThrottle prototype 2020-06-27 15:36:32 +01:00