mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-24 13:21:23 +01:00
Comments and copyright update
This commit is contained in:
parent
d83e34de39
commit
a965bed82e
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
@ -72,20 +72,17 @@ LCDDisplay *LCDDisplay::loop2(bool force)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!done) {
|
if (!done) {
|
||||||
// Non-blank line found, so copy it.
|
// Non-blank line found, so copy it.
|
||||||
strncpy(buffer, rowBuffer[rowNext], MAX_LCD_COLS);
|
for (int i=0; i<MAX_LCD_COLS+1; i++)
|
||||||
|
buffer[i] = rowBuffer[rowNext][i];
|
||||||
} else
|
} else
|
||||||
buffer[0] = '\0'; // Empty line
|
buffer[0] = '\0'; // Empty line
|
||||||
|
|
||||||
setRowNative(slot); // Set position for display
|
setRowNative(slot); // Set position for display
|
||||||
charIndex = 0;
|
charIndex = 0;
|
||||||
bptr = &buffer[0];
|
bptr = &buffer[0];
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
// Write next character, or a space to erase current position.
|
||||||
// Write one character, which will be a space if the string is exhausted.
|
|
||||||
char ch = *bptr;
|
char ch = *bptr;
|
||||||
if (ch) {
|
if (ch) {
|
||||||
writeNative(ch);
|
writeNative(ch);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
@ -22,7 +22,7 @@
|
|||||||
//
|
//
|
||||||
// It will create a driver implemntation and a shim class implementation.
|
// It will create a driver implemntation and a shim class implementation.
|
||||||
// This means that other classes can reference the shim without knowing
|
// This means that other classes can reference the shim without knowing
|
||||||
// which libraray is involved.
|
// which library is involved.
|
||||||
////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef LCD_Implementation_h
|
#ifndef LCD_Implementation_h
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* © 2020, Chris Harlow, 2021, Neil McKechnie. All rights reserved.
|
* © 2021, Chris Harlow, Neil McKechnie. All rights reserved.
|
||||||
*
|
*
|
||||||
* This file is part of CommandStation-EX
|
* This file is part of CommandStation-EX
|
||||||
*
|
*
|
||||||
@ -62,7 +62,6 @@ SSD1306AsciiWire LCDDriver;
|
|||||||
// Positions text write to start of row 1..n and clears previous text
|
// Positions text write to start of row 1..n and clears previous text
|
||||||
int y=row;
|
int y=row;
|
||||||
LCDDriver.setCursor(0, y);
|
LCDDriver.setCursor(0, y);
|
||||||
//LCDDriver.clearToEOL();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void LCDDisplay::writeNative(char b) {
|
void LCDDisplay::writeNative(char b) {
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
/* Arduino SSD1306Ascii Library
|
/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
|
||||||
* Copyright (C) 2015 by William Greiman
|
* Modifications (C) 2021 Neil McKechnie
|
||||||
*
|
|
||||||
* This file is part of the Arduino SSD1306Ascii Library
|
|
||||||
*
|
*
|
||||||
* This Library is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
/* Arduino SSD1306Ascii Library
|
/* Based on Arduino SSD1306Ascii Library, Copyright (C) 2015 by William Greiman
|
||||||
* Copyright (C) 2015 by William Greiman
|
* Modifications (C) 2021 Neil McKechnie
|
||||||
*
|
|
||||||
* This file is part of the Arduino SSD1306Ascii Library
|
|
||||||
*
|
*
|
||||||
* This Library is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -55,65 +55,6 @@
|
|||||||
// any other value means variable width font in FontCreator2 (thiele)
|
// any other value means variable width font in FontCreator2 (thiele)
|
||||||
// format with pixel padding
|
// format with pixel padding
|
||||||
|
|
||||||
// #include "Adafruit5x7.h" // Font from Adafruit GFX library
|
|
||||||
// #include "font5x7.h"
|
|
||||||
// #include "lcd5x7.h"
|
|
||||||
// #include "Stang5x7.h"
|
|
||||||
// #include "X11fixed7x14.h"
|
|
||||||
// #include "X11fixed7x14B.h"
|
|
||||||
// #include "ZevvPeep8x16.h"
|
|
||||||
|
|
||||||
#include "System5x7.h" // system font (fixed width)
|
#include "System5x7.h" // system font (fixed width)
|
||||||
// #include "SystemFont5x7.h" // backward compability System5x7 header
|
|
||||||
// #include "Iain5x7.h" // similar to system5x7 but proportional
|
|
||||||
// #include "Arial14.h" // proportional font
|
|
||||||
// #include "Arial_bold_14.h" // Bold proportional font
|
|
||||||
// #include "Corsiva_12.h"
|
|
||||||
// #include "Verdana_digits_24.h" // large proportional font contains [0-9] and :
|
|
||||||
|
|
||||||
// #include "Callibri10.h"
|
|
||||||
// #include "Callibri11.h"
|
|
||||||
// #include "Callibri11_bold.h"
|
|
||||||
// #include "Callibri11_italic.h"
|
|
||||||
// #include "Callibri14.h"
|
|
||||||
// #include "Callibri15.h"
|
|
||||||
// #include "Cooper19.h"
|
|
||||||
// #include "Cooper21.h"
|
|
||||||
// #include "Cooper26.h"
|
|
||||||
// #include "TimesNewRoman13.h"
|
|
||||||
// #include "TimesNewRoman13_italic.h"
|
|
||||||
// #include "TimesNewRoman16.h"
|
|
||||||
// #include "TimesNewRoman16_bold.h"
|
|
||||||
// #include "TimesNewRoman16_italic.h"
|
|
||||||
// #include "Verdana12.h"
|
|
||||||
// #include "Verdana12_bold.h"
|
|
||||||
// #include "Verdana12_italic.h"
|
|
||||||
// #include "Roosewood22.h"
|
|
||||||
// #include "Roosewood26.h"
|
|
||||||
|
|
||||||
// #include "fixednums7x15.h" // fixed width font - + , - . / [0-9] and :
|
|
||||||
// #include "fixednums8x16.h" // fixed width font - + , - . / [0-9] and :
|
|
||||||
// #include "fixednums15x31.h" // fixed width font - + , - . / [0-9] and :
|
|
||||||
|
|
||||||
// #include "CalBlk36.h"
|
|
||||||
// #include "CalLite24.h"
|
|
||||||
// #include "lcdnums12x16.h" // font that looks like LCD digits
|
|
||||||
// #include "lcdnums14x24.h" // font that looks like LCD digits
|
|
||||||
// #include "fixed_bold10x15.h"
|
|
||||||
// #include "Wendy3x5.h"
|
|
||||||
// #include "newbasic3x5.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These fonts require no-pad rendering code
|
|
||||||
*/
|
|
||||||
// #include "font8x8.h" // fixed wider font but similar to system5x7 font
|
|
||||||
// #include "cp437font8x8.h" // fixed Font from 80's IBM PC
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These fonts require UTF8 encoding support
|
|
||||||
*/
|
|
||||||
|
|
||||||
// #include "utf8font10x16.h" // UTF8 font up to U+00FF
|
|
||||||
// http://www.fileformat.info/info/charset/UTF-8/list.htm
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user