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

63 Commits

Author SHA1 Message Date
Fred
45eb7c80b6
Frightrisk hostname fix (#144)
* Fix esp8266 hostname in STA mode by checking for new version of the AT cmd instead of old cmd since some firmware still allows old commands

* Add more old firmware checks and set oldCmd earlier

* increment version number
2021-04-27 10:37:54 -04:00
Asbelos
85a2b9231b <* *> wrapped diags
And lots of \n cleanups.
2021-03-25 14:23:38 +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
c57add11e3 Merge branch 'wifitimeout' into candidate 2020-11-26 16:17:17 +01:00
Harald Barth
31022094c1 adjust timeouts 2020-11-23 00:46:14 +01:00
Harald Barth
a3ddcb059a make connection timeout configurable 2020-11-21 23:23:27 +01:00
Harald Barth
89b158f3d1 cut timeouts shorter 2020-11-21 22:20:15 +01:00
Harald Barth
7753f6dbb5 many typos fixed 2020-11-18 23:53:06 +01:00
Harald Barth
df2e40fa11 empty SSID is "unconfigured" as well 2020-11-18 23:42:37 +01:00
Harald Barth
612cb95f85 make AP password setable 2020-11-17 15:16:45 +01:00
Harald Barth
58550a68c8 surpress gcc warnings 2020-11-14 20:13:57 +01:00
Harald Barth
e809a460cc DONT_TOUCH_WIFI_CONFIG feature 2020-11-14 13:17:47 +01:00
Harald Barth
bf4190063a forgotten end of setup function 2020-10-28 21:16:41 +01:00
Harald Barth
27f3842ef5 do second try to set AP ESSID and PASSWORD if necessary 2020-10-28 20:32:20 +01:00
Harald Barth
c6cff3b4bd wifi setup tristate 2020-10-27 21:50:46 +01:00
Asbelos
6e9f584f72 Merge branch 'master' into wifi-reliability2 2020-10-27 12:52:02 +00:00
Asbelos
96fba12d59 ONLY 1 Call to WifiInboundHandler::setup!
Or it wastes 1.5kb each time!
2020-10-27 12:50:01 +00:00
Harald Barth
59a1a8eb1b turn off tcp server to reset connections 2020-10-27 07:33:04 +01: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
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
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
Harald Barth
32f1d7d890 Make all Wifi code disappear if Wifi is not enabled. 2020-09-25 22:14:20 +02:00
dexslab
bc8b01fbd6 Minor fixes start Uno Wifi Rev 2 fixes 2020-09-25 13:51:08 -04:00
dexslab
eb887fdbd2 Finish wifi interface fixes from serial123 branch, Fixes for flash string missing 2020-09-22 15:45:06 -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
bc53b3e599 Cleaned DIAG interface
All DIAGS can be switched off by StringFormatter::diagSerial=NULL;
2020-09-06 20:23:26 +01:00
Asbelos
6939c4c2e3 WifiInterface AP use mac address 2020-08-27 11:18:19 +01:00
Asbelos
9efcad908c Wifiinterfce AP mode
Create DCCEX_555555 with password PASS_555555    .... not yet using mac address.
2020-08-26 13:18:34 +01:00
Asbelos
ef21b0f97e WifiInterface
Recovering after arduino reboot with ES still connected and data inbound
2020-08-24 16:46:16 +01:00
Asbelos
b225ffb9f3 Prioritise arriving commands over responses
Sems to provide a more reliable system
2020-08-23 19:56:47 +01:00
Asbelos
55d175adb0 Restartable Wifi interface. 2020-08-20 10:38:59 +01:00
Asbelos
dd09342214 Config cleanup & http filter
Optional http filter
Additional Firebox motordriver setups (untested)
Config.h removed.
2020-08-19 13:12:39 +01:00
SteveT
5256c1d021 return new speed and dir to client, add timestamp to DIAG 2020-08-12 21:39:57 -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
Asbelos
e01b929fd0 Merge branch 'Stream-Reference-Fix' 2020-08-01 17:00:31 +01:00
Asbelos
9044cce2a3 Change Stream refernces to pointers
I misunderstood that references can never be changed.
2020-08-01 16:32:16 +01:00
Harald Barth
b0a7933b7b conditional WiFi setup 2020-07-31 12:46:57 +02:00
Asbelos
32b507248d Update WifiInterface.cpp
Merge newer AT commands and freveal AT version at startup
2020-07-25 15:16:06 +01:00
Asbelos
95a5f7b9a4 Revert "Merge branch 'thingietest'"
This reverts commit 79f552ab5f, reversing
changes made to 7af5effba9.
2020-07-25 14:40:59 +01:00
Harald Barth
ed332efd2e Using Serial2 and startup changes 2020-07-25 14:46:29 +02:00
Asbelos
09cf6763cb DIAGSERIAL corrections
for SAMD
2020-07-25 01:40:20 +01:00
Asbelos
928a9d834a AT command version
+ Withrottle minor fix
2020-07-22 15:14:07 +01:00
Asbelos
177e243507 Avoid bizarre compiler issues
AIDE and SAMD PlatformIO dont agree on write, so use print instead.
2020-07-20 09:55:04 +01:00
Asbelos
0ea0cc6391 Wifinterface startup checks
more relaxed checks as some chips differ
2020-07-19 18:31:51 +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
42e60966e8 Non blocking wifi reply
Still needs send replyerror  timeout check
2020-07-16 11:52:06 +01:00
Asbelos
44d41ac4d6 Wifi write(0)
Some environments complain about sending a char
2020-07-14 13:32:55 +01:00
Asbelos
4aceff8b7c WiThrott;e FIXES 2020-07-05 21:00:27 +01:00