From 77da0b9468d55246081c8bd3e505cf2ae20406e8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 11 Oct 2023 15:45:25 +0200 Subject: stop use GEM; rename objects display -> displayEPaper, u8g2Fonts > u8g2 --- main.ino | 53 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/main.ino b/main.ino index d8f50b1..8067cb4 100644 --- a/main.ino +++ b/main.ino @@ -43,30 +43,8 @@ EasyButton button_select(BUTTON_PIN_SELECT); // source: https://github.com/ZinggJM/GxEPD2/blob/master/examples/GxEPD2_Example/GxEPD2_display_selection.h#L192 GxEPD2_BW displayEPaper(GxEPD2_290(EPD_CS, EPD_DC, EPD_RSET, EPD_BUSY)); -U8G2_FOR_ADAFRUIT_GFX u8g2Fonts; +U8G2_FOR_ADAFRUIT_GFX u8g2; -#include - -// Create variables that will be editable through the menu and assign them initial values -int number = -512; -boolean enablePrint = false; - -// Create two menu item objects of class GEMItem, linked to number and enablePrint variables -GEMItem menuItemInt("Number:", number); -GEMItem menuItemBool("Enable print:", enablePrint); - -// Create menu button that will trigger printData() function. It will print value of our number variable -// to Serial monitor if enablePrint is true. We will write (define) this function later. However, we should -// forward-declare it in order to pass to GEMItem constructor -void printData(); // Forward declaration -GEMItem menuItemButton("Print", printData); - -// Create menu page object of class GEMPage. Menu page holds menu items (GEMItem) and represents menu level. -// Menu can have multiple menu pages (linked to each other) with multiple menu items each -GEMPage menuPageMain("Main Menu"); - -// Create menu object of class GEM_u8g2. Supply its constructor with reference to u8g2 object we created earlier -GEM_u8g2 menu(u8g2); #endif void setup() { @@ -86,11 +64,7 @@ void setup() { led.breathe(2000); displayEPaper.init(115200, true, 2, false); - u8g2Fonts.begin(display); - - menu.init(); - setupMenu(); - menu.drawMenu(); + u8g2.begin(displayEPaper); } void loop() { @@ -122,26 +96,3 @@ void onButtonSelectPressed() { Serial.println("button SELECT clicked"); led.on(); } - -void setupMenu() { - // Add menu items to menu page - menuPageMain.addMenuItem(menuItemInt); - menuPageMain.addMenuItem(menuItemBool); - menuPageMain.addMenuItem(menuItemButton); - - // Add menu page to menu and set it as current - menu.setMenuPageCurrent(menuPageMain); -} - -void printData() { - // If enablePrint flag is set to true (checkbox on screen is checked)... - if (enablePrint) { - // ...print the number to Serial - // Note, there might be some problems w/ displaying Cyrillic characters in Serial monitor, - // in which case adjusting baud rate may help - Serial.print("Число: "); - Serial.println(number); - } else { - Serial.println("Печать не разрешена:("); - } -} -- cgit v1.2.3