mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-24 21:21:24 +01:00
4861e592c7
* 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>
205 lines
8.0 KiB
C
205 lines
8.0 KiB
C
/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
|
|
* Modifications (C) 2021 Neil McKechnie
|
|
*
|
|
* This Library is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This Library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with the Arduino SSD1306Ascii Library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
/**
|
|
* @file SSD1306init.h
|
|
* @brief Display controller initialization commands.
|
|
*/
|
|
#ifndef SSD1306init_h
|
|
#define SSD1306init_h
|
|
//------------------------------------------------------------------------------
|
|
#ifndef __AVR__
|
|
/** Handle AVR flash addressing. */
|
|
#define MEM_TYPE
|
|
#else // __AVR__
|
|
#define MEM_TYPE __attribute__ ((progmem))
|
|
#endif // __AVR__
|
|
//------------------------------------------------------------------------------
|
|
/** Set Lower Column Start Address for Page Addressing Mode. */
|
|
#define SSD1306_SETLOWCOLUMN 0x00
|
|
/** Set Higher Column Start Address for Page Addressing Mode. */
|
|
#define SSD1306_SETHIGHCOLUMN 0x10
|
|
/** Set Memory Addressing Mode. */
|
|
#define SSD1306_MEMORYMODE 0x20
|
|
/** Set display RAM display start line register from 0 - 63. */
|
|
#define SSD1306_SETSTARTLINE 0x40
|
|
/** Set Display Contrast to one of 256 steps. */
|
|
#define SSD1306_SETCONTRAST 0x81
|
|
/** Enable or disable charge pump. Follow with 0X14 enable, 0X10 disable. */
|
|
#define SSD1306_CHARGEPUMP 0x8D
|
|
/** Set Segment Re-map between data column and the segment driver. */
|
|
#define SSD1306_SEGREMAP 0xA0
|
|
/** Resume display from GRAM content. */
|
|
#define SSD1306_DISPLAYALLON_RESUME 0xA4
|
|
/** Force display on regardless of GRAM content. */
|
|
#define SSD1306_DISPLAYALLON 0xA5
|
|
/** Set Normal Display. */
|
|
#define SSD1306_NORMALDISPLAY 0xA6
|
|
/** Set Inverse Display. */
|
|
#define SSD1306_INVERTDISPLAY 0xA7
|
|
/** Set Multiplex Ratio from 16 to 63. */
|
|
#define SSD1306_SETMULTIPLEX 0xA8
|
|
/** Set Display off. */
|
|
#define SSD1306_DISPLAYOFF 0xAE
|
|
/** Set Display on. */
|
|
#define SSD1306_DISPLAYON 0xAF
|
|
/**Set GDDRAM Page Start Address. */
|
|
#define SSD1306_SETSTARTPAGE 0XB0
|
|
/** Set COM output scan direction normal. */
|
|
#define SSD1306_COMSCANINC 0xC0
|
|
/** Set COM output scan direction reversed. */
|
|
#define SSD1306_COMSCANDEC 0xC8
|
|
/** Set Display Offset. */
|
|
#define SSD1306_SETDISPLAYOFFSET 0xD3
|
|
/** Sets COM signals pin configuration to match the OLED panel layout. */
|
|
#define SSD1306_SETCOMPINS 0xDA
|
|
/** This command adjusts the VCOMH regulator output. */
|
|
#define SSD1306_SETVCOMDETECT 0xDB
|
|
/** Set Display Clock Divide Ratio/ Oscillator Frequency. */
|
|
#define SSD1306_SETDISPLAYCLOCKDIV 0xD5
|
|
/** Set Pre-charge Period */
|
|
#define SSD1306_SETPRECHARGE 0xD9
|
|
/** Deactivate scroll */
|
|
#define SSD1306_DEACTIVATE_SCROLL 0x2E
|
|
/** No Operation Command. */
|
|
#define SSD1306_NOP 0XE3
|
|
//------------------------------------------------------------------------------
|
|
/** Set Pump voltage value: (30H~33H) 6.4, 7.4, 8.0 (POR), 9.0. */
|
|
#define SH1106_SET_PUMP_VOLTAGE 0X30
|
|
/** First byte of set charge pump mode */
|
|
#define SH1106_SET_PUMP_MODE 0XAD
|
|
/** Second byte charge pump on. */
|
|
#define SH1106_PUMP_ON 0X8B
|
|
/** Second byte charge pump off. */
|
|
#define SH1106_PUMP_OFF 0X8A
|
|
//------------------------------------------------------------------------------
|
|
/**
|
|
* @struct DevType
|
|
* @brief Device initialization structure.
|
|
*/
|
|
struct DevType {
|
|
/**
|
|
* Pointer to initialization command bytes.
|
|
*/
|
|
const uint8_t* initcmds;
|
|
/**
|
|
* Number of initialization bytes.
|
|
*/
|
|
const uint8_t initSize;
|
|
/**
|
|
* Width of the diaplay in pixels.
|
|
*/
|
|
const uint8_t lcdWidth;
|
|
/**
|
|
* Height of the display in pixels.
|
|
*/
|
|
const uint8_t lcdHeight;
|
|
/**
|
|
* Column offset RAM to display. Used to pick start column of SH1106.
|
|
*/
|
|
const uint8_t colOffset;
|
|
};
|
|
//------------------------------------------------------------------------------
|
|
// this section is based on https://github.com/adafruit/Adafruit_SSD1306
|
|
/** Initialization commands for a 128x32 SSD1306 oled display. */
|
|
static const uint8_t MEM_TYPE Adafruit128x32init[] = {
|
|
// Init sequence for Adafruit 128x32 OLED module
|
|
SSD1306_DISPLAYOFF,
|
|
SSD1306_SETDISPLAYCLOCKDIV, 0x80, // the suggested ratio 0x80
|
|
SSD1306_SETMULTIPLEX, 0x1F, // ratio 32
|
|
SSD1306_SETDISPLAYOFFSET, 0x0, // no offset
|
|
SSD1306_SETSTARTLINE | 0x0, // line #0
|
|
SSD1306_CHARGEPUMP, 0x14, // internal vcc
|
|
SSD1306_MEMORYMODE, 0x02, // page mode
|
|
SSD1306_SEGREMAP | 0x1, // column 127 mapped to SEG0
|
|
SSD1306_COMSCANDEC, // column scan direction reversed
|
|
SSD1306_SETCOMPINS, 0x02, // sequential COM pins, disable remap
|
|
SSD1306_SETCONTRAST, 0x7F, // contrast level 127
|
|
SSD1306_SETPRECHARGE, 0xF1, // pre-charge period (1, 15)
|
|
SSD1306_SETVCOMDETECT, 0x40, // vcomh regulator level
|
|
SSD1306_DISPLAYALLON_RESUME,
|
|
SSD1306_NORMALDISPLAY,
|
|
SSD1306_DISPLAYON
|
|
};
|
|
/** Initialize a 128x32 SSD1306 oled display. */
|
|
static const DevType MEM_TYPE Adafruit128x32 = {
|
|
Adafruit128x32init,
|
|
sizeof(Adafruit128x32init),
|
|
128,
|
|
32,
|
|
0
|
|
};
|
|
//------------------------------------------------------------------------------
|
|
// This section is based on https://github.com/adafruit/Adafruit_SSD1306
|
|
/** Initialization commands for a 128x64 SSD1306 oled display. */
|
|
static const uint8_t MEM_TYPE Adafruit128x64init[] = {
|
|
// Init sequence for Adafruit 128x64 OLED module
|
|
SSD1306_DISPLAYOFF,
|
|
SSD1306_SETDISPLAYCLOCKDIV, 0x80, // the suggested ratio 0x80
|
|
SSD1306_SETMULTIPLEX, 0x3F, // ratio 64
|
|
SSD1306_SETDISPLAYOFFSET, 0x0, // no offset
|
|
SSD1306_SETSTARTLINE | 0x0, // line #0
|
|
SSD1306_CHARGEPUMP, 0x14, // internal vcc
|
|
SSD1306_MEMORYMODE, 0x02, // page mode
|
|
SSD1306_SEGREMAP | 0x1, // column 127 mapped to SEG0
|
|
SSD1306_COMSCANDEC, // column scan direction reversed
|
|
SSD1306_SETCOMPINS, 0x12, // alt COM pins, disable remap
|
|
SSD1306_SETCONTRAST, 0x7F, // contrast level 127
|
|
SSD1306_SETPRECHARGE, 0xF1, // pre-charge period (1, 15)
|
|
SSD1306_SETVCOMDETECT, 0x40, // vcomh regulator level
|
|
SSD1306_DISPLAYALLON_RESUME,
|
|
SSD1306_NORMALDISPLAY,
|
|
SSD1306_DISPLAYON
|
|
};
|
|
/** Initialize a 128x64 oled display. */
|
|
static const DevType MEM_TYPE Adafruit128x64 = {
|
|
Adafruit128x64init,
|
|
sizeof(Adafruit128x64init),
|
|
128,
|
|
64,
|
|
0
|
|
};
|
|
//------------------------------------------------------------------------------
|
|
// This section is based on https://github.com/stanleyhuangyc/MultiLCD
|
|
/** Initialization commands for a 128x64 SH1106 oled display. */
|
|
static const uint8_t MEM_TYPE SH1106_128x64init[] = {
|
|
SSD1306_DISPLAYOFF,
|
|
SSD1306_SETSTARTPAGE | 0X0, // set page address
|
|
SSD1306_SETCONTRAST, 0x80, // 128
|
|
SSD1306_SEGREMAP | 0X1, // set segment remap
|
|
SSD1306_NORMALDISPLAY, // normal / reverse
|
|
SSD1306_SETMULTIPLEX, 0x3F, // ratio 64
|
|
SH1106_SET_PUMP_MODE, SH1106_PUMP_ON, // set charge pump enable
|
|
SH1106_SET_PUMP_VOLTAGE | 0X2, // 8.0 volts
|
|
SSD1306_COMSCANDEC, // Com scan direction
|
|
SSD1306_SETDISPLAYOFFSET, 0X00, // set display offset
|
|
SSD1306_SETDISPLAYCLOCKDIV, 0X80, // set osc division
|
|
SSD1306_SETPRECHARGE, 0X1F, // set pre-charge period
|
|
SSD1306_SETCOMPINS, 0X12, // set COM pins
|
|
SSD1306_SETVCOMDETECT, 0x40, // set vcomh
|
|
SSD1306_DISPLAYON
|
|
};
|
|
/** Initialize a 128x64 oled SH1106 display. */
|
|
static const DevType MEM_TYPE SH1106_128x64 = {
|
|
SH1106_128x64init,
|
|
sizeof(SH1106_128x64init),
|
|
128,
|
|
64,
|
|
2 // SH1106 is a 132x64 controller. Use middle 128 columns.
|
|
};
|
|
#endif // SSD1306init_h
|