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

55 Commits

Author SHA1 Message Date
Asbelos
67c8366512
Fix auto rejoin after prog cmd (needs version n umber!) (#148)
* ack down flank double check

* ack gap properly reported

* zero gap count; tolerate 2 samples per gap

* Fix auto rejoin after prog cmd

Moved more setup out of the BASELINE loop so its not checked every time while waiting for reset counter.
Added REJOIN diag..

* Stable 100mS and off 30mS

* Init powerOff after flag.

Co-authored-by: Harald Barth <haba@kth.se>
2021-05-07 18:24:34 +01:00
Asbelos
bded5d3588
3.0.12 Fix Functions >127 (just a bug) (#146)
* Fix Functions >127

* Update version.h

* avoid freds fix

Co-authored-by: Fred <fndecker@gmail.com>
2021-04-27 10:45:26 -04:00
Harald Barth
30c13190a4 merge 28speedsteps 2021-04-06 22:04:16 +02:00
Mike S
54773297bf Minor changes to Arduino Type List & DCCWaveform 2021-03-26 07:37:17 -04:00
Mike S
8141311e66 Revisions to support Teensy 3.x and Teensy 4.x 2021-03-25 13:16:12 -04:00
Fred
d7b2cf3d76
Assorted bits (#138)
* LCN

* Prevent deprecated compiler warning

* Implement huge function numbers

* new commands

<! [cab]> forget locos.
<9> ESTOP ALL.
<D RESET> reboot arduino

* Waveform accuracy msg

* Drop post-write verify

* UNUSED_PIN current measure

and callback -2 for cv actions.

* Correct diags

* ESTOP a forget loco

* ESTOP loco on forget

* Avoid compiler warning

* current sensor offset

* Restore <1 JOIN> after prog track operation

* <!> ESTOP <-> FORGET

* Auto current offset detection

* manage current offset and diagnostics

* neater msg at startup

* Add startup message to LCN master

* DCC::setJoinRelayPin

Co-authored-by: Asbelos <asbelos@btinternet.com>
2021-03-23 10:37:05 -04:00
Harald Barth
46d0304ce0 28 speed steps as global debug option 2021-03-16 22:51:33 +01: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
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
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
David Cutting
ed5031cbf6 Remove all boards but Uno, Mega, and Nano 2020-11-15 16:21:25 -07:00
Asbelos
3fe04c1a0e DCC getFn 2020-10-12 22:18:55 +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
Harald Barth
85d60dfbbd D PROGBOOST ON command 2020-09-27 13:03:46 +02:00
dexslab
bc8b01fbd6 Minor fixes start Uno Wifi Rev 2 fixes 2020-09-25 13:51:08 -04:00
Harald Barth
9c5396bbc2 not worth the hassle 2020-09-24 11:27:21 +02:00
Harald Barth
1d47536501 Merge branch 'feature/config' of https://github.com/DCC-EX/CommandStation-EX into feature/config 2020-09-24 10:58:17 +02:00
Harald Barth
b810fb45c7 config.h only in .ino 2020-09-24 10:58:08 +02:00
Asbelos
caef013d35 Supply motor shield name for <s> 2020-09-24 09:51:09 +01:00
FrightRisk
3d94d8347a Add support for 2 or 4 line LCD Display 2020-09-23 21:54:01 -04:00
FrightRisk
ba79668a8f Add Ardunio and Motor Board types to <s> cmd 2020-09-23 15:17:01 -04:00
Harald Barth
9e1d85f9bb make number of slots in Uno configurable 2020-09-22 23:24:30 +02:00
Harald Barth
9bb9fa5e84 rewrite freeMemory code 2020-09-22 23:10:52 +02:00
Asbelos
59febed37d <V> commands
UNTESTED
2020-09-18 00:04:42 +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
5c775531f6 Introduce POWERON and POWEROFF opcodes 2020-09-08 09:47:40 +02:00
Asbelos
31651d3e44 Optional Timer number override 2020-08-28 12:34:58 +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
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
93446f19ed Two functions changeFn and setFn dependent on if called from WiThrottle or DCCEXparser 2020-08-01 14:06:39 +02: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
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
bec57345f1 ACK diagnostics
Type <D 1> to enable
2020-07-01 10:27:53 +01:00
Asbelos
669356df7d First WiThrottle prototype 2020-06-27 15:36:32 +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
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
d1843fe38e Ack updates and diags commented out
ACK logic now seems to work.
2020-06-07 16:29:53 +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