mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-23 08:06:13 +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>
235 lines
6.8 KiB
C++
235 lines
6.8 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 SSD1306AsciiWire.h
|
|
* @brief Class for I2C displays using Wire.
|
|
*/
|
|
#ifndef SSD1306AsciiWire_h
|
|
#define SSD1306AsciiWire_h
|
|
|
|
#include <Wire.h>
|
|
|
|
#include "Arduino.h"
|
|
#include "LCDDisplay.h"
|
|
#include "SSD1306font.h"
|
|
#include "SSD1306init.h"
|
|
|
|
//------------------------------------------------------------------------------
|
|
/** SSD1306Ascii version basis */
|
|
#define SDD1306_ASCII_VERSION 1.3.0
|
|
//------------------------------------------------------------------------------
|
|
// Configuration options.
|
|
|
|
/** Use larger faster I2C code. */
|
|
#define OPTIMIZE_I2C 1
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Values for writeDisplay() mode parameter.
|
|
/** Write to Command register. */
|
|
#define SSD1306_MODE_CMD 0
|
|
/** Write one byte to display RAM. */
|
|
#define SSD1306_MODE_RAM 1
|
|
/** Write to display RAM with possible buffering. */
|
|
#define SSD1306_MODE_RAM_BUF 2
|
|
//------------------------------------------------------------------------------
|
|
|
|
/**
|
|
* @class SSD1306Ascii
|
|
* @brief SSD1306 base class
|
|
*/
|
|
class SSD1306Ascii : public Print {
|
|
public:
|
|
using Print::write;
|
|
SSD1306Ascii() {}
|
|
/**
|
|
* @brief Clear the display and set the cursor to (0, 0).
|
|
*/
|
|
void clear();
|
|
/**
|
|
* @brief Clear a region of the display.
|
|
*
|
|
* @param[in] c0 Starting column.
|
|
* @param[in] c1 Ending column.
|
|
* @param[in] r0 Starting row;
|
|
* @param[in] r1 Ending row;
|
|
* @note The final cursor position will be (c0, r0).
|
|
*/
|
|
void clear(uint8_t c0, uint8_t c1, uint8_t r0, uint8_t r1);
|
|
/**
|
|
* @brief Clear a field of n fieldWidth() characters.
|
|
*
|
|
* @param[in] col Field start column.
|
|
*
|
|
* @param[in] row Field start row.
|
|
*
|
|
* @param[in] n Number of characters in the field.
|
|
*
|
|
*/
|
|
void clearField(uint8_t col, uint8_t row, uint8_t n);
|
|
/**
|
|
* @brief Clear the display to the end of the current line.
|
|
* @note The number of rows cleared will be determined by the height
|
|
* of the current font.
|
|
* @note The cursor will be returned to the original position.
|
|
*/
|
|
void clearToEOL();
|
|
/**
|
|
* @return The current column in pixels.
|
|
*/
|
|
inline uint8_t col() const { return m_col; }
|
|
/**
|
|
* @return The display hight in pixels.
|
|
*/
|
|
inline uint8_t displayHeight() const { return m_displayHeight; }
|
|
/**
|
|
* @brief Set display to normal or 180 degree remap mode.
|
|
*
|
|
* @param[in] mode true for normal mode, false for remap mode.
|
|
*
|
|
* @note Adafruit and many ebay displays use remap mode.
|
|
* Use normal mode to rotate these displays 180 degrees.
|
|
*/
|
|
void displayRemap(bool mode);
|
|
/**
|
|
* @return The display height in rows with eight pixels to a row.
|
|
*/
|
|
inline uint8_t displayRows() const { return m_displayHeight / 8; }
|
|
/**
|
|
* @return The display width in pixels.
|
|
*/
|
|
inline uint8_t displayWidth() const { return m_displayWidth; }
|
|
/**
|
|
* @brief Set the cursor position to (0, 0).
|
|
*/
|
|
inline void home() { setCursor(0, 0); }
|
|
/**
|
|
* @brief Initialize the display controller.
|
|
*
|
|
* @param[in] dev A display initialization structure.
|
|
*/
|
|
void init(const DevType* dev);
|
|
/**
|
|
* @return the current row number with eight pixels to a row.
|
|
*/
|
|
inline uint8_t row() const { return m_row; }
|
|
/**
|
|
* @brief Set the current column number.
|
|
*
|
|
* @param[in] col The desired column number in pixels.
|
|
*/
|
|
void setCol(uint8_t col);
|
|
/**
|
|
* @brief Set the display contrast.
|
|
*
|
|
* @param[in] value The contrast level in th range 0 to 255.
|
|
*/
|
|
void setContrast(uint8_t value);
|
|
/**
|
|
* @brief Set the cursor position.
|
|
*
|
|
* @param[in] col The column number in pixels.
|
|
* @param[in] row the row number in eight pixel rows.
|
|
*/
|
|
void setCursor(uint8_t col, uint8_t row);
|
|
/**
|
|
* @brief Set the current font.
|
|
*
|
|
* @param[in] font Pointer to a font table.
|
|
*/
|
|
void setFont(const uint8_t* font);
|
|
/**
|
|
* @brief Set the current row number.
|
|
*
|
|
* @param[in] row the row number in eight pixel rows.
|
|
*/
|
|
void setRow(uint8_t row);
|
|
/**
|
|
* @brief Write a command byte to the display controller.
|
|
*
|
|
* @param[in] c The command byte.
|
|
* @note The byte will immediately be sent to the controller.
|
|
*/
|
|
inline void ssd1306WriteCmd(uint8_t c) { writeDisplay(c, SSD1306_MODE_CMD); }
|
|
/**
|
|
* @brief Write a byte to RAM in the display controller.
|
|
*
|
|
* @param[in] c The data byte.
|
|
* @note The byte will immediately be sent to the controller.
|
|
*/
|
|
void ssd1306WriteRam(uint8_t c);
|
|
/**
|
|
* @brief Write a byte to RAM in the display controller.
|
|
*
|
|
* @param[in] c The data byte.
|
|
* @note The byte may be buffered until a call to ssd1306WriteCmd
|
|
* or ssd1306WriteRam or flushDisplay.
|
|
*/
|
|
void ssd1306WriteRamBuf(uint8_t c);
|
|
/**
|
|
* @brief Display a character.
|
|
*
|
|
* @param[in] c The character to display.
|
|
* @return one for success else zero.
|
|
*/
|
|
size_t write(uint8_t c);
|
|
|
|
protected:
|
|
virtual void writeDisplay(uint8_t b, uint8_t mode) = 0;
|
|
virtual void flushDisplay() = 0;
|
|
uint8_t m_col; // Cursor column.
|
|
uint8_t m_row; // Cursor RAM row.
|
|
uint8_t m_displayWidth; // Display width.
|
|
uint8_t m_displayHeight; // Display height.
|
|
uint8_t m_colOffset; // Column offset RAM to SEG.
|
|
const uint8_t* m_font = nullptr; // Current font.
|
|
|
|
// Only fixed size 5x7 fonts in a 6x8 cell are supported.
|
|
const int fontWidth = 5;
|
|
const int fontHeight = 7;
|
|
const uint8_t letterSpacing = 1;
|
|
uint8_t m_fontFirstChar;
|
|
uint8_t m_fontCharCount;
|
|
};
|
|
|
|
/**
|
|
* @class SSD1306AsciiWire
|
|
* @brief Class for I2C displays using Wire.
|
|
*/
|
|
class SSD1306AsciiWire : public SSD1306Ascii {
|
|
public:
|
|
/**
|
|
* @brief Initialize the display controller.
|
|
*
|
|
* @param[in] dev A device initialization structure.
|
|
* @param[in] i2cAddr The I2C address of the display controller.
|
|
*/
|
|
void begin(const DevType* dev, uint8_t i2cAddr);
|
|
|
|
protected:
|
|
void writeDisplay(uint8_t b, uint8_t mode);
|
|
void flushDisplay();
|
|
|
|
protected:
|
|
uint8_t m_i2cAddr;
|
|
#if OPTIMIZE_I2C
|
|
uint8_t m_nData;
|
|
#endif // OPTIMIZE_I2C
|
|
};
|
|
|
|
#endif // SSD1306AsciiWire_h
|