diff --git a/MusicRing.ino b/MusicRing.ino index 1f01b6e..74a59cb 100644 --- a/MusicRing.ino +++ b/MusicRing.ino @@ -1,14 +1,14 @@ -#include +#include "Arduino.h" //#include -#include "modules/LED_Ring.h" -#include "implement/Display__Adafruit_SSD1306.h" -#include "misc/bitmaps.h" +#include "./modules/LED_Ring.h" +#include "./implement/Display__Adafruit_SSD1306.h" +#include "./misc/bitmaps.h" LED_Ring_PINOUT pinout { 5, 6, 7, 8, 9 }; LED_Ring ring(32, pinout); -Display_Adafruit_SSD1306 screen(128, 32, Display::Ori_HORIZONTAL); +Screen screen(128, 32, Display::Ori_HORIZONTAL); void setup() { Serial.begin(115200); diff --git a/implement/Display__Adafruit_SSD1306.h b/implement/Display__Adafruit_SSD1306.h index 3fd9f91..2fc3610 100644 --- a/implement/Display__Adafruit_SSD1306.h +++ b/implement/Display__Adafruit_SSD1306.h @@ -1,12 +1,12 @@ #pragma once #include "../modules/Display.h" -#include +#include "Adafruit_SSD1306.h" -class Display_Adafruit_SSD1306 : public Display { +class Screen : public Display { public: Adafruit_SSD1306* adafruit; - Display_Adafruit_SSD1306(uint16_t width, uint16_t height, uint16_t orientation) : Display(width, height, orientation) { + Screen(uint16_t width, uint16_t height, uint16_t orientation) : Display(width, height, orientation) { adafruit = new Adafruit_SSD1306(width, height, &Wire, -1); }; @@ -16,11 +16,14 @@ public: } - void writePixel() override { + // void writePixel() override { + + // } - } - ~Display_Adafruit_SSD1306() { + + + ~Screen() { delete adafruit; } };