1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 17:46:14 +01:00
Commit Graph

95 Commits

Author SHA1 Message Date
Harald Barth
c245c27f5d Repair railcom prototype to get signal on main and prog 2022-05-14 00:49:39 +02:00
Asbelos
4391b049d8 tidying, join and cmd 2021-05-14 13:32:20 +01:00
Harald Barth
30c13190a4 merge 28speedsteps 2021-04-06 22:04:16 +02:00
Harald Barth
0020ec2b71 more keywords 2021-04-06 22:02:20 +02:00
Harald Barth
7a1b363954 needs fixed sized int 2021-04-06 22:00:33 +02:00
Asbelos
44ca3bc7b9
Merge pull request #139 from mjs513/Teensy-Revisions
Added support for Teensy 3.2, 3.5, 3.6, 4.0 and 4.1
2021-03-30 23:17:52 +01:00
Asbelos
a0538ca61b 3.0.9 newlines 2021-03-30 22:01:37 +01:00
Mike S
8e63c452b2 Fix a few bugs as a result of latest version 2021-03-25 14:02:33 -04:00
Mike S
8141311e66 Revisions to support Teensy 3.x and Teensy 4.x 2021-03-25 13:16:12 -04:00
Asbelos
85a2b9231b <* *> wrapped diags
And lots of \n cleanups.
2021-03-25 14:23:38 +00: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
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
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
6cc5550927 result should be as is (can be -1 to indicate fail) 2021-01-30 22:54:38 +01:00
Asbelos
d71c95e9d2 Merge branch 'master' into ConsistR 2021-01-21 11:09:09 +00:00
Asbelos
fa2b740bb4 Merge branch 'startupCommands' into ConsistR 2021-01-21 11:00:01 +00:00
mstevetodd
611838d60c
add warn/trip level to meter response (#120)
* send milliAmps and meter setup for new JMRI Meter function

* add warn/trip level to meter response

provides support for separate max vs trip levels
2021-01-18 17:46:41 -05:00
Asbelos
7d90e4241a Add <W locoid> command
Automatically clears consist and manages short/long addresses
2021-01-18 10:06:46 +00:00
mstevetodd
418d8eb1b2
send milliAmps and meter setup for new JMRI Meter function (#113)
* send milliAmps and meter setup for new JMRI Meter function
2021-01-08 16:57:32 -05:00
Asbelos
895b2aaaaa Implement mySetup.h facility 2021-01-07 20:58:23 +00:00
Fred
0618a0bd72
RMFT Hooks (#112)
These hooks do NOT require RMFT code to be present.... but they offer the hooks that RMFT will need when available.

authored-by: Asbelos <asbelos@btinternet.com>
2021-01-05 13:05:17 -05:00
mstevetodd
42075f838e
<T> should send turnout definitions, not just states (#110)
* use int, not byte for witSpeed

* add turnout, sensor and output states to 's'tatus message

* <T> should send turnout definitions, not just states
2021-01-04 10:57:03 -05:00
mstevetodd
9d92fd9451
add turnout, sensor and output states to 's'tatus message (#108)
* add support for FireBox_Mk1, reduce heartbeat, separate eStop time

* make match master

* make match master

* Update defines.h

* FIX: return WiThrottle speedstep, not DCC speedstep, in response to speed change request.

Should close #104

* use int, not byte for witSpeed

* add turnout, sensor and output states to 's'tatus message
2020-12-27 10:20:11 -05:00
Harald Barth
a1b802d91b Merge branch 'currentvalues' 2020-12-11 22:04:39 +01:00
Harald Barth
73b5325085 better speed step comment 2020-12-11 19:03:05 +01:00
Harald Barth
a1f7d06508 Report current as 1/1024 as expected by JMRI 2020-12-06 21:43:37 +01:00
Harald Barth
f2db288102 Merge branch 'ackdiag' into candidate 2020-11-26 16:20:34 +01:00
Harald Barth
89fd98e4af Merge branch 'pluscommand-trackpoweroff' into candidate 2020-11-26 16:20:18 +01:00
Harald Barth
edc39e7342 ack pulse length configurable from diag 2020-11-24 21:39:21 +01:00
Harald Barth
3faa48476c ack diag better messages 2020-11-24 21:12:55 +01:00
Asbelos
2ea8bfdd7c
Mcommand (#100) 2020-11-24 07:49:15 -05:00
Harald Barth
beca0b3368 Safety measure: Turm power off at + command 2020-11-23 22:13:36 +01:00
Asbelos
258113c580
Fix T commands (#59)
Fix <H ..> response giving 128 instead of 1 for active status
2020-11-18 07:34:02 -05:00
Asbelos
a85131ee17 experimental 2020-10-30 13:00:02 +00:00
Harald Barth
1a1dbb42bc Merge branch 'frightrisk-outputs' of https://github.com/DCC-EX/CommandStation-EX into frightrisk-outputs
Conflicts:
	DCCEXParser.cpp
2020-10-28 20:41:25 +01:00
Harald Barth
019001675e return false if parseS does not find any sensors 2020-10-27 07:24:48 +01:00
FrightRisk
8101e75dae Remove unneccessary break command 2020-10-26 14:00:25 -04:00
FrightRisk
babdad06ca Remove commands that were called twice 2020-10-26 13:28:47 -04:00
FrightRisk
369a75f958 Fix return values for outputs and sensors (<X> and <O> responses 2020-10-26 12:57:37 -04:00
Harald Barth
ecd176042e checkAll() only checks one now (and should be renamed) 2020-10-26 00:56:25 +01:00
Harald Barth
9099af3188 Sensors show their status at change (as in classic) 2020-10-25 23:52:22 +01:00
Harald Barth
7dca6db1c5 Bit shuffling for function groups 2020-10-13 23:08:19 +02:00
Harald Barth
1c2df3fe22 Ack current setable by debug statement D ACK LIMIT n 2020-10-08 23:39:04 +02: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
Harald Barth
6dc4bcdb71 D EEPROM command 2020-10-04 21:20:13 +02:00
Harald Barth
75d7547f11 Turnouts stored to EEPROM without trashing other stuff 2020-10-03 14:07:25 +02:00
FrightRisk
7c47bb1562 Fix Turnout and Output return value 2020-09-29 17:19:02 -04:00
Harald Barth
7cd9e68717 turn PROGBOOST off at PROG off 2020-09-27 13:26:29 +02:00