Add support for the OLED display on GIGA R1

Author: alranel

.codespellrc

@@ -4,4 +4,4 @@
 ignore-words-list = ,
 check-filenames =
 check-hidden =
-skip = ./.git,./src/Grove_Temperature_And_Humidity_Sensor,./src/Grove_-_Barometer_Sensor_BMP280
+skip = ./.git,./src/Grove_Temperature_And_Humidity_Sensor,./src/Grove_-_Barometer_Sensor_BMP280,./src/U8g2

library.properties

@@ -8,4 +8,4 @@ category=Sensors
 url=https://sensorkit.arduino.cc/
 architectures=avr,mbed_giga
 precompiled=false
-depends=Grove Temperature And Humidity Sensor,Grove - Barometer Sensor BMP280,U8g2,Grove-3-Axis-Digital-Accelerometer-2g-to-16g-LIS3DHTR
+depends=Grove-3-Axis-Digital-Accelerometer-2g-to-16g-LIS3DHTR

src/Arduino_SensorKit.cpp

@@ -1,20 +1,7 @@
 #include "Arduino_SensorKit.h"
 
-#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR) || defined(ARDUINO_UNOR4_MINIMA) || defined(ARDUINO_UNOR4_WIFI)
-  #define _PIN_SDA SDA
-  #define _PIN_SCL SCL
-  #define _WIRE Wire
-#elif defined(ARDUINO_GIGA)
-  #define _PIN_SDA I2C_SDA1
-  #define _PIN_SCL I2C_SCL1
-  #define _WIRE Wire1
-#else
-  #error "This board is not supported by Arduino_SensorKit"
-#endif
-
 //Declare component's classes
-U8X8_SSD1306_128X64_NONAME_SW_I2C Oled_SW(_PIN_SCL, _PIN_SDA, U8X8_PIN_NONE);
-U8X8_SSD1306_128X64_NONAME_HW_I2C Oled_HW(U8X8_PIN_NONE, _PIN_SCL, _PIN_SDA);
+SensorKit_Oled Oled;
 SensorKit_DHT Environment(3,DHT11);
 DHT Environment_I2C(DHT20);
 SensorKit_LIS3DHTR Accelerometer(_WIRE);

src/Arduino_SensorKit.h

@@ -14,18 +14,46 @@
 #include "Arduino_SensorKit_BMP280.h"   // Pressure
 #include "Arduino_SensorKit_LIS3DHTR.h" // Accel
 #include "Grove_Temperature_And_Humidity_Sensor/DHT.h"                        // Temp & Humidity
-#include "U8x8lib.h"                    // OLED Display
+#include "U8g2/src/U8x8lib.h"                    // OLED Display
+
+#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR) || defined(ARDUINO_UNOR4_MINIMA) || defined(ARDUINO_UNOR4_WIFI)
+  #define _PIN_SDA SDA
+  #define _PIN_SCL SCL
+  #define _WIRE Wire
+#elif defined(ARDUINO_GIGA)
+  #define _PIN_SDA I2C_SDA1
+  #define _PIN_SCL I2C_SCL1
+  #define _WIRE Wire1
+#else
+  #error "This board is not supported by Arduino_SensorKit"
+#endif
 
 class SensorKit_DHT;
 
-//Make the declared components from the .cpp to the sketch available
-extern U8X8_SSD1306_128X64_NONAME_SW_I2C Oled_SW;
-extern U8X8_SSD1306_128X64_NONAME_HW_I2C Oled_HW;
+// The upstream U8X8 library provides two variants, one for hardware I2C (using 
+// the Wire object provided by Arduino) and one for software I2C. The latter 
+// doesn't seem to work. However it seems that when breaking the sensors from
+// the big PCB, the software I2C variant works better, so we support both 
+// letting the user define SENSORKIT_USE_SW_I2C.
 #ifdef SENSORKIT_USE_SW_I2C
-  #define Oled Oled_SW
+  #define _Oled_class U8X8_SSD1306_128X64_NONAME_SW_I2C
 #else
-  #define Oled Oled_HW
+  #define _Oled_class U8X8_SSD1306_128X64_NONAME_HW_I2C
 #endif
+class SensorKit_Oled : public _Oled_class {
+  public:
+  #ifdef SENSORKIT_USE_SW_I2C
+    SensorKit_Oled() : _Oled_class(_PIN_SCL, _PIN_SDA, U8X8_PIN_NONE) {};
+  #else
+    SensorKit_Oled() : _Oled_class(U8X8_PIN_NONE, _PIN_SCL, _PIN_SDA) {};
+    bool begin(void) {
+      _Oled_class::wire = &_WIRE;
+      return _Oled_class::begin();
+    };
+  #endif
+};
+extern SensorKit_Oled Oled;
+
 extern SensorKit_LIS3DHTR Accelerometer;
 extern SensorKit_BMP280 Pressure;
 extern SensorKit_DHT Environment;

src/U8g2/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.scss": "scss",
+        "chrono": "cpp"
+    }
+}

src/U8g2/LICENSE

@@ -0,0 +1,79 @@
+
+The U8g2lib code (http://code.google.com/p/u8g2/) is licensed under the terms of 
+the new-bsd license (two-clause bsd license).
+See also: http://www.opensource.org/licenses/bsd-license.php
+
+Fonts are licensed under different conditions.
+See 
+	https://github.com/olikraus/u8g2/wiki/fntgrp
+for detailed information on the licensing conditions for each font.
+
+The example code in sys/raspi_gpio/hal will use the bcm2835 lib from Mike McCauley
+which is licensed under GPL V3: http://www.airspayce.com/mikem/bcm2835/
+
+============ X11 Fonts COUR, HELV, NCEN, TIM, SYMB ============
+
+For fonts derived from the following files, the license below applies.
+COURB08.BDF COURB10.BDF COURB12.BDF COURB14.BDF COURB18.BDF 
+COURB24.BDF COURR08.BDF COURR10.BDF COURR12.BDF COURR14.BDF 
+COURR18.BDF COURR24.BDF HELVB08.BDF HELVB10.BDF HELVB12.BDF HELVB14.BDF 
+HELVB18.BDF HELVB24.BDF HELVR08.BDF HELVR10.BDF HELVR12.BDF HELVR14.BDF 
+HELVR18.BDF HELVR24.BDF NCENB08.BDF NCENB10.BDF NCENB12.BDF 
+NCENB14.BDF NCENB18.BDF NCENB24.BDF NCENR08.BDF NCENR10.BDF 
+NCENR12.BDF NCENR14.BDF NCENR18.BDF NCENR24.BDF SYMB08.BDF SYMB10.BDF 
+SYMB12.BDF SYMB14.BDF SYMB18.BDF SYMB24.BDF TIMB08.BDF TIMB10.BDF 
+TIMB12.BDF TIMB14.BDF TIMB18.BDF TIMB24.BDF TIMR08.BDF TIMR10.BDF 
+TIMR12.BDF TIMR14.BDF TIMR18.BDF TIMR24.BDF 
+
+Copyright 1984-1989, 1994 Adobe Systems Incorporated.
+Copyright 1988, 1994 Digital Equipment Corporation.
+
+Adobe is a trademark of Adobe Systems Incorporated which may be
+registered in certain jurisdictions.
+Permission to use these trademarks is hereby granted only in
+association with the images described in this file.
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notices appear in all
+copies and that both those copyright notices and this permission
+notice appear in supporting documentation, and that the names of
+Adobe Systems and Digital Equipment Corporation not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  Adobe Systems and
+Digital Equipment Corporation make no representations about the
+suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+
+============ BSD License for U8g2lib Code ============
+
+Universal 8bit Graphics Library (http://code.google.com/p/u8g2/)
+
+Copyright (c) 2016, [email protected]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list 
+  of conditions and the following disclaimer.
+  
+* Redistributions in binary form must reproduce the above copyright notice, this 
+  list of conditions and the following disclaimer in the documentation and/or other 
+  materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+

src/U8g2/README.md

@@ -0,0 +1,12 @@
+# U8g2_Arduino: Arduino Monochrome Graphics Library
+
+![https://raw.githubusercontent.com/wiki/olikraus/u8g2/img/uc1701_dogs102_uno_board_320.jpg](https://raw.githubusercontent.com/wiki/olikraus/u8g2/img/uc1701_dogs102_uno_board_320.jpg) 
+
+U8glib V2 library for Arduino
+
+Description: https://github.com/olikraus/u8g2/wiki
+
+Issue Tracker: https://github.com/olikraus/u8g2/issues
+
+Download (2.34.22): https://github.com/olikraus/U8g2_Arduino/archive/master.zip
+