Removing possible library conflicts with default OV767x thanks to Etien_Godfrey on edX

plancherb1 · plancherb1 · commit 3e65e51c5e31 · 2021-03-19T14:03:05.000-04:00
diff --git a/examples/multi_tenant/arduino_image_provider.cpp b/examples/multi_tenant/arduino_image_provider.cpp
@@ -15,7 +15,7 @@
 #ifndef ARDUINO_EXCLUDE_CODE
 
 #include "Arduino.h"
-#include "Arduino_OV767X.h"
+#include <TinyMLShield.h>
 
 // Get an image from the camera module
 TfLiteStatus GetImage(tflite::ErrorReporter* error_reporter, int image_width,
diff --git a/examples/person_detection/arduino_image_provider.cpp b/examples/person_detection/arduino_image_provider.cpp
@@ -15,7 +15,7 @@
 #ifndef ARDUINO_EXCLUDE_CODE
 
 #include "Arduino.h"
-#include "Arduino_OV767X.h"
+#include <TinyMLShield.h>
 
 // Get an image from the camera module
 TfLiteStatus GetImage(tflite::ErrorReporter* error_reporter, int image_width,
diff --git a/extras/CameraCapture/CameraCapture.ino b/extras/CameraCapture/CameraCapture.ino
@@ -34,7 +34,7 @@
   This example code is in the public domain.
 */
 
-#include <Arduino_OV767X.h>
+#include <TinyMLShield.h>
 
 unsigned short pixels[176 * 144]; // QCIF: 176x144 X 2 bytes per pixel (RGB565)
 
diff --git a/extras/CameraCaptureRawBytes/CameraCaptureRawBytes.ino b/extras/CameraCaptureRawBytes/CameraCaptureRawBytes.ino
@@ -8,7 +8,7 @@
   This example code is in the public domain.
 */
 
-#include <Arduino_OV767X.h>
+#include <TinyMLShield.h>
 
 int bytesPerFrame;
 
diff --git a/extras/CameraTestPattern/CameraTestPattern.ino b/extras/CameraTestPattern/CameraTestPattern.ino
@@ -34,7 +34,7 @@
   This example code is in the public domain.
 */
 
-#include <Arduino_OV767X.h>
+#include <TinyMLShield.h>
 
 unsigned short pixels[176 * 144]; // QCIF: 176x144 X 2 bytes per pixel (RGB565)
 
diff --git a/extras/ConnectionTest/ConnectionTest.ino b/extras/ConnectionTest/ConnectionTest.ino
@@ -27,7 +27,7 @@
   
 */
 
-#include <Arduino_OV767X.h>
+#include <TinyMLShield.h>
 #include <Arduino_CRC32.h>
 
 int bytesPerFrame;
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Harvard_TinyMLx
-version=1.0.0-Alpha
+version=1.0.1-Alpha
 author=TinyMLx Authors
 maintainer=Brian Plancher <brian.plancher@gmail.com>
 sentence=Supports the TinyML edX Course and TinyML Shield.
diff --git a/src/Arduino_OV767X_TinyMLx.h b/src/Arduino_OV767X_TinyMLx.h
@@ -7,6 +7,6 @@
 #ifndef _ARUDINO_OV767X_H_
 #define _ARUDINO_OV767X_H_
 
-#include "OV767X.h"
+#include "OV767X_TinyMLx.h"
 
 #endif
diff --git a/src/OV767X_TinyMLx.cpp b/src/OV767X_TinyMLx.cpp
@@ -7,7 +7,7 @@
 #include <Arduino.h>
 #include <Wire.h>
 
-#include "OV767X.h"
+#include "OV767X_TinyMLx.h"
 
 // if not defined in the variant
 #ifndef digitalPinToBitMask
diff --git a/src/OV767X_TinyMLx.h b/src/OV767X_TinyMLx.h
diff --git a/src/TinyMLShield.h b/src/TinyMLShield.h
@@ -1,4 +1,4 @@
-#include "Arduino_OV767X.h"
+#include "Arduino_OV767X_TinyMLx.h"
 #define BUTTON_PIN 13
 
 // Custom shield button pin setting

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Arduino_OV767X.h"`
	`1`	`+#include "Arduino_OV767X_TinyMLx.h"`
`2`	`2`	`#define BUTTON_PIN 13`
`3`	`3`
`4`	`4`	`// Custom shield button pin setting`