1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-26 05:41:24 +01:00
Commit Graph

2427 Commits

Author SHA1 Message Date
Neil McKechnie
1cc147cc98 Ensure loop2() doesn't run during initialisation if there's no display.
Prevent loop2 from doing anything when lcdDisplay not set up.  If there's a display configured but not one attached, then the OLED code will set lcdDisplay to null and no display will be configured or used by the loop() function.  However, because of the way the initialisation code works, loop2() is called during initialisation.
2021-03-16 22:02:39 +00:00
Harald Barth
46d0304ce0 28 speed steps as global debug option 2021-03-16 22:51:33 +01:00
Fred
05b225c352 Committing a SHA 2021-03-16 13:05:28 +00:00
Fred
c9ade73376
Update release_notes.md 2021-03-16 09:05:10 -04:00
Harald Barth
55cdbbbb66 28 speed step prototype 2021-03-16 10:59:14 +01:00
Harald Barth
086336158f Committing a SHA 2021-03-14 21:17:25 +00:00
Harald Barth
f2891ee348 make generates MAC addr compliant with the IEEE standard by setting the Locally Administered bit and clearing the Group Adress bit 2021-03-14 22:15:48 +01:00
Harald Barth
25c2f06574 Committing a SHA 2021-03-12 21:14:36 +00:00
Harald Barth
98071602c3 Bugfix: Transmit packages of size MAX_PACKET_SIZE (5) as well 2021-03-12 22:12:13 +01:00
mstevetodd
d35529e94a Committing a SHA 2021-03-12 14:32:30 +00:00
mstevetodd
9e49167be9
Merge pull request #134 from DCC-EX/EDdriveaway
ED driveaway
2021-03-12 09:31:21 -05:00
Asbelos
cec26c47e2 Catch up with Steves change 2021-03-12 10:38:30 +00:00
Fred
fcd54b3a80 Committing a SHA 2021-03-11 19:54:48 +00:00
Fred
ad4095fb04
Update release_notes.md 2021-03-11 14:54:29 -05:00
Asbelos
a8bd3df992 Committing a SHA 2021-03-11 14:00:43 +00:00
Asbelos
933eab5f2d Ban mixed wifi/ethernet 2021-03-11 13:58:58 +00:00
Asbelos
c51b445e41 unjoin automatically 2021-03-11 13:35:47 +00:00
Neil McKechnie
f2c2e7ecaa Committing a SHA 2021-03-10 17:56:16 +00:00
Neil McKechnie
62b17d4a71
Merge pull request #133 from DCC-EX/neil-updates
Protect minimum memory threshold against interrupts.
2021-03-10 17:55:55 +00:00
Neil McKechnie
0b3c0bfe9e Update freeMemory.cpp
Add explanatory comment.
2021-03-10 10:33:42 +00:00
Neil McKechnie
eb54c78d74 Change initial value for free memory.
Change initial value from 32767 (maximum value of a 16-bit signed integer) to __INT_MAX__ (compiler-defined maximum value for an int).
2021-03-09 23:41:33 +00:00
Neil McKechnie
def6c24bac Remove redundant option for memory monitoring.
Memory monitoring now enabled always.
2021-03-09 23:39:25 +00:00
Neil McKechnie
163dd270e8 Memory monitoring updates
Split update from read value;
Inhibit interrupts when reading (normally done from loop code);
Don't inhibit interrupts when updating (normally done from interupt code);
Make freeMemory() local and ask for inline code generation.
2021-03-09 22:43:41 +00:00
Asbelos
4f7d3a5cfc ED Drive away from prog track featuire 2021-03-09 20:44:44 +00:00
Neil McKechnie
0880507d89 Make memory monitoring non-optional. 2021-03-09 10:38:48 +00:00
Neil McKechnie
62f1c04ee3 Revert "Add optional loop time monitor."
This reverts commit 7a2beda2a9.
2021-03-09 10:30:20 +00:00
Neil McKechnie
7954c85b7d Update freeMemory.cpp 2021-03-09 10:27:38 +00:00
Neil McKechnie
fab05bac79 Update freeMemory.cpp
Inhibit interrupts while updating/reading minimum_free_memory as it is accessed from interrupt handler.
2021-03-09 10:13:04 +00:00
Fred
6866216dfc Committing a SHA 2021-03-09 02:50:24 +00:00
Fred
e67ab2b05f
Update version.h 2021-03-08 21:50:11 -05:00
mstevetodd
5d27da58b8 Committing a SHA 2021-03-09 02:46:24 +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
5f34fc396a Committing a SHA 2021-03-09 02:32:06 +00:00
Fred
c34c93c2cc
Update platformio.ini
Remove dependency on DIO2 in PlatformIO.ini
2021-03-08 21:31:48 -05:00
Neil McKechnie
7a2beda2a9 Add optional loop time monitor.
By defining ENABLE_LOOP_MEASUREMENT as true in config.h, the loop measurement will be enabled.  This measures the time between successive executions of the main CS loop to help identify if something is taking too long and holding up the other loop functions.
2021-03-08 15:32:40 +00:00
Asbelos
f3d7851467 Committing a SHA 2021-03-08 13:53:35 +00:00
Asbelos
809b54d9f0
Merge pull request #131 from DCC-EX/neil-freemem
More conservative memory monitoring
2021-03-08 13:53:17 +00:00
Neil McKechnie
609d3d13de Mark minimum_free_memory volatile. 2021-03-08 13:25:13 +00:00
Neil McKechnie
ddc55690f3 More conservative memory monitoring
Add function to maintain a  minimum value seen of free memory.  Add call to it in DCCWaveform interrupt handler (assumed to be the likely worst case for stack usage).  Report this minimum value in main loop.
2021-03-08 13:09:09 +00:00
Asbelos
9562d1a3b9 Committing a SHA 2021-03-08 10:41:15 +00:00
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
mstevetodd
df4bae365d Committing a SHA 2021-03-07 21:57:19 +00:00
mstevetodd
7706e6560b
Update GITHUB_SHA.h 2021-03-07 16:57:05 -05:00
mstevetodd
090ece6e59 Committing a SHA 2021-03-07 21:51:23 +00:00
mstevetodd
5a5702a5b5
Merge branch 'master' into master 2021-03-07 16:51:08 -05:00
Fred
a072f3222b Committing a SHA 2021-03-07 20:58:54 +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
mstevetodd
4e2bb445d1 Committing a SHA 2021-02-16 01:26:09 +00:00
mstevetodd
ae6958b636
Merge pull request #20 from DCC-EX/master
merge upstream changes
2021-02-15 20:25:51 -05:00
Harald Barth
781d0325af Committing a SHA 2021-02-15 09:52:46 +00:00