Merge pull request #251 from mrvdb/sh1106-support

Screen width correction for sh1106 display controller
1.2-legacy
Kevin Hester 2020-07-04 12:13:04 -07:00 zatwierdzone przez GitHub
commit 0d320fe29b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 2 dodań i 5 usunięć

Wyświetl plik

@ -35,11 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FONT_HEIGHT 14 // actually 13 for "ariel 10" but want a little extra space #define FONT_HEIGHT 14 // actually 13 for "ariel 10" but want a little extra space
#define FONT_HEIGHT_16 (ArialMT_Plain_16[1] + 1) #define FONT_HEIGHT_16 (ArialMT_Plain_16[1] + 1)
#ifdef USE_SH1106 // This means the *visible* area (sh1106 can address 132, but shows 128 for example)
#define SCREEN_WIDTH 132
#else
#define SCREEN_WIDTH 128 #define SCREEN_WIDTH 128
#endif
#define SCREEN_HEIGHT 64 #define SCREEN_HEIGHT 64
#define TRANSITION_FRAMERATE 30 // fps #define TRANSITION_FRAMERATE 30 // fps
#define IDLE_FRAMERATE 1 // in fps #define IDLE_FRAMERATE 1 // in fps

Wyświetl plik

@ -92,7 +92,7 @@ class Screen : public PeriodicTask
// Implementation to Adjust Brightness // Implementation to Adjust Brightness
void adjustBrightness(); void adjustBrightness();
int brightness = 150; uint8_t brightness = 150;
/// Starts showing the Bluetooth PIN screen. /// Starts showing the Bluetooth PIN screen.
// //