解决Arduino.h中max/min与std::冲突

Author: mysterywolf

examples/hello_world/arduino_output_handler.cpp

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <algorithm>
 
-#include "Arduino.h"
+#include "tensorflow/Arduino.h"
 #include "constants.h"
 #include "output_handler.h"
 #include "tensorflow/lite/micro/micro_log.h"

examples/hello_world/hello_world.cpp

@@ -14,10 +14,10 @@ limitations under the License.
 ==============================================================================*/
 
 #include <TensorFlowLite.h>
-#include <RTduino.h>
 #include "constants.h"
 #include "model.h"
 #include "output_handler.h"
+#include "tensorflow/Arduino.h"
 #include "tensorflow/lite/micro/all_ops_resolver.h"
 #include "tensorflow/lite/micro/micro_interpreter.h"
 #include "tensorflow/lite/micro/micro_log.h"

examples/micro_speech/arduino_command_responder.cpp

@@ -19,7 +19,7 @@ limitations under the License.
 
 #ifndef ARDUINO_EXCLUDE_CODE
 
-#include "Arduino.h"
+#include "tensorflow/Arduino.h"
 #include "command_responder.h"
 #include "tensorflow/lite/micro/micro_log.h"
 

examples/person_detection/arduino_detection_responder.cpp

@@ -21,7 +21,7 @@ limitations under the License.
 
 #include <cmath>
 
-#include "Arduino.h"
+#include "tensorflow/Arduino.h"
 #include "detection_responder.h"
 #include "tensorflow/lite/micro/micro_log.h"
 

examples/person_detection/arduino_image_provider.cpp

@@ -30,7 +30,7 @@ using namespace test_over_serial;
 
 #ifndef ARDUINO_EXCLUDE_CODE
 
-#include "Arduino.h"
+#include "tensorflow/Arduino.h"
 
 namespace {
 

src/tensorflow/Arduino.h

@@ -0,0 +1,11 @@
+#ifndef TensorFlowLite_Arduino_h
+#define TensorFlowLite_Arduino_h
+
+
+#include <RTduino.h> /* has inclued rtthread.h and Arduino.h */
+
+/* avoid conflict with std::min and std::max */
+#undef min
+#undef max
+
+#endif /* TensorFlowLite_Arduino_h */

src/tensorflow/lite/micro/micro_string.cpp

@@ -20,7 +20,7 @@ limitations under the License.
 // more code.
 
 #include "tensorflow/lite/micro/micro_string.h"
-#include <rtthread.h>
+#include "tensorflow/Arduino.h"
 
 extern "C" int MicroVsnprintf(char* output, int len, const char* format,
                               va_list args) {

src/tensorflow/lite/micro/micro_time.cpp

@@ -28,7 +28,7 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_time.h"
 
 #if !defined(TF_LITE_USE_CTIME)
-#include <Arduino.h>
+#include "tensorflow/Arduino.h"
 #else
 #include <ctime>
 #endif

src/tensorflow/lite/micro/system_setup.cpp

@@ -19,7 +19,7 @@ limitations under the License.
 
 #include "tensorflow/lite/micro/debug_log.h"
 
-#include "Arduino.h"
+#include "tensorflow/Arduino.h"
 
 #define DEBUG_SERIAL_OBJECT (Serial)