Electropepper/NMM-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed OLED init to match latest Adafruit_SSD1306 library update.

Browse Source
This commit is contained in:
Ricardo_lap
2018-12-13 20:26:26 +00:00
parent f3ab7adf06
commit 466a748e46
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/v01/Makefile
View File

@@ -4,11 +4,11 @@ BOARD_TAG = pro
BOARD_SUB = 8MHzatmega328 BOARD_SUB = 8MHzatmega328
USER_LIB_PATH += /home/ricardo/Arduino/libraries USER_LIB_PATH += /home/ricardo/Arduino/libraries
ARDUINO_LIBS += Adafruit_GFX_Library \ ARDUINO_LIBS += Adafruit_GFX_Library \
SoftwareSerial \ SoftwareSerial \
Adafruit_SSD1306 \ Adafruit_SSD1306 \
SPI \ SPI \
Wire Wire
ARDUINO_DIR = /home/ricardo/Arduino_IDE ARDUINO_DIR = /home/ricardo/Installs/arduino-1.8.7
MONITOR_PORT = /dev/ttyUSB0 MONITOR_PORT = /dev/ttyUSB0
include /usr/share/arduino-mk/Arduino.mk -include /usr/share/arduino/Arduino.mk
-include /home/ricardo/Installs/Arduino-Makefile-1.6.0/Arduino.mk

7
firmware/v01/v01.ino
View File

@@ -14,7 +14,10 @@ Wed 24 Jan 23:11:25 GMT 2018
#include <Adafruit_SSD1306.h> #include <Adafruit_SSD1306.h>
#define OLED_RESET 8 #define OLED_RESET 8
Adafruit_SSD1306 display(OLED_RESET); // Create display object for OLED display #define SCREEN_WIDTH 128 // OLED display width, in pixels
#define SCREEN_HEIGHT 56 // OLED display height, in pixels
// create display object for oled display
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
#define ON 0 // ON means pin is on GND #define ON 0 // ON means pin is on GND
#define OFF 1 // OFF means pin is on VCC #define OFF 1 // OFF means pin is on VCC
@@ -190,7 +193,7 @@ ISR(TIMER1_COMPA_vect)
} }
if (!rCANCEL) { // If button OK pressed if (!rCANCEL) // If button OK pressed
{ {
if (prevMenu == 1) // and the prevMenu is 1 if (prevMenu == 1) // and the prevMenu is 1
{ {