[tfkernel] remove test_over_serial in system_setup

Author: mysterywolf

src/tensorflow/lite/micro/system_setup.cpp

@@ -20,31 +20,22 @@ limitations under the License.
 #include "tensorflow/lite/micro/debug_log.h"
 
 #if defined(ARDUINO) && !defined(ARDUINO_ARDUINO_NANO33BLE)
-#define ARDUINO_EXCLUDE_CODE
+//#define ARDUINO_EXCLUDE_CODE
 #endif  // defined(ARDUINO) && !defined(ARDUINO_ARDUINO_NANO33BLE)
 
 #ifndef ARDUINO_EXCLUDE_CODE
 
 #include "Arduino.h"
 
-// The Arduino DUE uses a different object for the default serial port shown in
-// the monitor than most other models, so make sure we pick the right one. See
-// https://github.com/arduino/Arduino/issues/3088#issuecomment-406655244
-#if defined(__SAM3X8E__)
-#define DEBUG_SERIAL_OBJECT (SerialUSB)
-#else
 #define DEBUG_SERIAL_OBJECT (Serial)
-#endif
-
-extern "C" void DebugLog(const char* s) { DEBUG_SERIAL_OBJECT.print(s); }
 
 namespace tflite {
 
-constexpr ulong kSerialMaxInitWait = 4000;  // milliseconds
+constexpr unsigned long kSerialMaxInitWait = 4000;  // milliseconds
 
 void InitializeTarget() {
-  DEBUG_SERIAL_OBJECT.begin(9600);
-  ulong start_time = millis();
+  DEBUG_SERIAL_OBJECT.begin();
+  unsigned long start_time = millis();
   while (!DEBUG_SERIAL_OBJECT) {
     // allow for Arduino IDE Serial Monitor synchronization
     if (millis() - start_time > kSerialMaxInitWait) {
@@ -55,84 +46,4 @@ void InitializeTarget() {
 
 }  // namespace tflite
 
-namespace test_over_serial {
-
-// Change baud rate on default serial port
-void SerialChangeBaudRate(const int baud) {
-  DEBUG_SERIAL_OBJECT.begin(baud);
-  ulong start_time = millis();
-  while (!DEBUG_SERIAL_OBJECT) {
-    // allow for Arduino IDE Serial Monitor synchronization
-    if (millis() - start_time > tflite::kSerialMaxInitWait) {
-      break;
-    }
-  }
-}
-
-class _RingBuffer : public RingBufferN<kSerialMaxInputLength + 1> {
- public:
-  bool need_reset = false;
-};
-
-static _RingBuffer _ring_buffer;
-
-// SerialReadLine
-// Read a set of ASCII characters from the default
-// serial port.  Data is read up to the first newline ('\\n') character.
-// This function uses an internal buffer which is automatically reset.
-// The buffer will not contain the newline character.
-// The buffer will be zero ('\\0') terminated.
-// The <timeout> value is in milliseconds.  Any negative value means that
-// the wait for data will be forever.
-// Returns std::pair<size_t, char*>.
-// The first pair element is the number of characters in buffer not including
-// the newline character or zero terminator.
-// Returns {0, NULL} if the timeout occurs.
-std::pair<size_t, char*> SerialReadLine(int timeout) {
-  if (_ring_buffer.need_reset) {
-    _ring_buffer.need_reset = false;
-    _ring_buffer.clear();
-  }
-
-  ulong start_time = millis();
-
-  while (true) {
-    int value = DEBUG_SERIAL_OBJECT.read();
-    if (value >= 0) {
-      if (value == '\n') {
-        // read a newline character
-        _ring_buffer.store_char('\0');
-        _ring_buffer.need_reset = true;
-        break;
-      } else {
-        // read other character
-        _ring_buffer.store_char(value);
-        if (_ring_buffer.availableForStore() == 1) {
-          // buffer is full
-          _ring_buffer.store_char('\0');
-          _ring_buffer.need_reset = true;
-          break;
-        }
-      }
-    }
-    if (timeout < 0) {
-      // wait forever
-      continue;
-    } else if (millis() - start_time >= static_cast<ulong>(timeout)) {
-      // timeout
-      return std::make_pair(0UL, reinterpret_cast<char*>(NULL));
-    }
-  }
-
-  return std::make_pair(static_cast<size_t>(_ring_buffer.available() - 1),
-                        reinterpret_cast<char*>(_ring_buffer._aucBuffer));
-}
-
-// SerialWrite
-// Write the ASCII characters in <buffer> to the default serial port.
-// The <buffer> must be zero terminated.
-void SerialWrite(const char* buffer) { DEBUG_SERIAL_OBJECT.print(buffer); }
-
-}  // namespace test_over_serial
-
 #endif  // ARDUINO_EXCLUDE_CODE

src/tensorflow/lite/micro/system_setup.h

@@ -27,33 +27,4 @@ void InitializeTarget();
 
 }  // namespace tflite
 
-namespace test_over_serial {
-
-// computed for Arduino Nano 33 BLE Sense
-constexpr size_t kSerialMaxInputLength = (64);
-
-// Change baud rate on default serial port
-void SerialChangeBaudRate(const int baud);
-
-// SerialReadLine
-// Read a set of ASCII characters from the default
-// serial port.  Data is read up to the first newline ('\\n') character.
-// This function uses an internal buffer which is automatically reset.
-// The buffer will not contain the newline character.
-// The buffer will be zero ('\\0') terminated.
-// The <timeout> value is in milliseconds.  Any negative value means that
-// the wait for data will be forever.
-// Returns std::pair<size_t, char*>.
-// The first pair element is the number of characters in buffer not including
-// the newline character or zero terminator.
-// Returns {0, NULL} if the timeout occurs.
-std::pair<size_t, char*> SerialReadLine(int timeout);
-
-// SerialWrite
-// Write the ASCII characters in <buffer> to the default serial port.
-// The <buffer> must be zero terminated.
-void SerialWrite(const char* buffer);
-
-}  // namespace test_over_serial
-
 #endif  // TENSORFLOW_LITE_MICRO_SYSTEM_SETUP_H_