Merge pull request #14 from meshcore-dev/dev

merge Dev

src/helpers/ui/DisplayDriver.h

@@ -14,6 +14,7 @@ public:
   int height() const { return _h; }
 
   virtual bool isOn() = 0;
+  virtual bool isEink() { return false; } // default to non-eink, override in eink drivers
   virtual void turnOn() = 0;
   virtual void turnOff() = 0;
   virtual void clear() = 0;

src/helpers/ui/E213Display.h

@@ -26,6 +26,7 @@ public:
   }
   bool begin();
   bool isOn() override { return _isOn; }
+  bool isEink() override { return true; }
   void turnOn() override;
   void turnOff() override;
   void clear() override;

src/helpers/ui/E290Display.h

@@ -22,6 +22,7 @@ public:
 
   bool begin();
   bool isOn() override { return _isOn; }
+  bool isEink() override { return true; }
   void turnOn() override;
   void turnOff() override;
   void clear() override;

src/helpers/ui/GxEPDDisplay.h

@@ -46,7 +46,8 @@ public:
 
   bool begin();
 
-  bool isOn() override {return _isOn;};
+  bool isOn() override { return _isOn; }
+  bool isEink() override { return true; }
   void turnOn() override;
   void turnOff() override;
   void clear() override;

src/helpers/ui/OLEDDisplay.cpp

@@ -842,7 +842,7 @@ void OLEDDisplay::drawLogBuffer(uint16_t xMove, uint16_t yMove) {
   uint16_t lastPos  = 0;
 
   for (uint16_t i=0;i<this->logBufferFilled;i++){
-    // Everytime we have a \n print
+    // Every time we have a \n print
     if (this->logBuffer[i] == 10) {
       length++;
       // Draw string on line `line` from lastPos to length
@@ -1155,7 +1155,7 @@ void OLEDDisplay::setFontTableLookupFunction(FontTableLookupFunction function) {
 
 char DefaultFontTableLookup(const uint8_t ch) {
     // UTF-8 to font table index converter
-    // Code form http://playground.arduino.cc/Main/Utf8ascii
+    // Code from http://playground.arduino.cc/Main/Utf8ascii
 	static uint8_t LASTCHAR;
 
 	if (ch < 128) { // Standard ASCII-set 0..0x7F handling

src/helpers/ui/buzzer.h

@@ -5,7 +5,7 @@
 
 /* class abstracts underlying RTTTL library 
 
-    Just a simple imlementation to start.  At the moment use same
+    Just a simple implementation to start.  At the moment use same
     melody for message and discovery
     Suggest enum type for different sounds
     - on message