clean up

Author: hathach

libraries/Firmata/Boards.h

@@ -780,6 +780,27 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define PIN_TO_SERVO(p)         (p)
 #define DEFAULT_PWM_RESOLUTION  10
 
+// STM32 based boards
+#elif defined(ARDUINO_ARCH_STM32)
+#define TOTAL_ANALOG_PINS       NUM_ANALOG_INPUTS
+#define TOTAL_PINS              NUM_DIGITAL_PINS
+#define TOTAL_PORTS             MAX_NB_PORT
+#define VERSION_BLINK_PIN       LED_BUILTIN
+// PIN_SERIALY_RX/TX defined in the variant.h
+#define IS_PIN_DIGITAL(p)       (digitalPinIsValid(p) && !pinIsSerial(p))
+#define IS_PIN_ANALOG(p)        ((p >= A0) && (p < AEND) && !pinIsSerial(p))
+#define IS_PIN_PWM(p)           (IS_PIN_DIGITAL(p) && digitalPinHasPWM(p))
+#define IS_PIN_SERVO(p)         IS_PIN_DIGITAL(p)
+#define IS_PIN_I2C(p)           (IS_PIN_DIGITAL(p) && digitalPinHasI2C(p))
+#define IS_PIN_SPI(p)           (IS_PIN_DIGITAL(p) && digitalPinHasSPI(p))
+#define IS_PIN_INTERRUPT(p)     (IS_PIN_DIGITAL(p) && (digitalPinToInterrupt(p) > NOT_AN_INTERRUPT)))
+#define IS_PIN_SERIAL(p)        (digitalPinHasSerial(p) && !pinIsSerial(p))
+#define PIN_TO_DIGITAL(p)       (p)
+#define PIN_TO_ANALOG(p)        (p-A0)
+#define PIN_TO_PWM(p)           (p)
+#define PIN_TO_SERVO(p)         (p)
+#define DEFAULT_PWM_RESOLUTION  PWM_RESOLUTION
+
 // Adafruit Bluefruit nRF52 boards
 #elif defined(ARDUINO_NRF52_ADAFRUIT)
 #define TOTAL_ANALOG_PINS       NUM_ANALOG_INPUTS
@@ -798,7 +819,6 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define PIN_TO_PWM(p)           (p)
 #define PIN_TO_SERVO(p)         (p)
 
-
 // anything else
 #else
 #error "Please edit Boards.h with a hardware abstraction for this board"

libraries/Firmata/utility/EthernetClientStream.h

@@ -130,9 +130,9 @@ EthernetClientStream::maintain()
     connected = host ? client.connect(host, port) : client.connect(ip, port);
     if (!connected) {
       time_connect = millis();
-      DEBUG_PRINTLN("connection failed. attempting to reconnect...");
+      DEBUG_PRINTLN("Connection failed. Attempting to reconnect...");
     } else {
-      DEBUG_PRINTLN("connected");
+      DEBUG_PRINTLN("Connected");
     }
   }
   return connected;

libraries/Firmata/utility/EthernetServerStream.cpp

@@ -0,0 +1,3 @@
+/*
+ * Implementation is in EthernetServerStream.h to avoid linker issues.
+ */

libraries/Firmata/utility/EthernetServerStream.h

@@ -0,0 +1,147 @@
+/*
+  EthernetServerStream.h
+
+  Copyright (C) 2017 Marc Josef Pees. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  See file LICENSE.txt for further informations on licensing terms.
+
+  Last updated July 10th, 2017
+ */
+
+#ifndef ETHERNETSERVERSTREAM_H
+#define ETHERNETSERVERSTREAM_H
+
+#include <inttypes.h>
+#include <Stream.h>
+#include <Ethernet.h>
+
+//#define SERIAL_DEBUG
+#include "firmataDebug.h"
+
+class EthernetServerStream : public Stream
+{
+  public:
+    EthernetServerStream(IPAddress localip, uint16_t port);
+    int available();
+    int read();
+    int peek();
+    void flush();
+    size_t write(uint8_t);
+    void maintain(IPAddress localip);
+
+  private:
+    EthernetClient client;
+    IPAddress localip;
+    uint16_t port;
+    bool connected;
+    bool maintain();
+    void stop();
+    
+  protected:
+    EthernetServer server = EthernetServer(3030);
+    bool listening = false;
+    bool connect_client();
+};
+
+
+/*
+ * EthernetServerStream.cpp
+ * Copied here as a hack to linker issues with 3rd party board packages that don't properly
+ * implement the Arduino network APIs.
+ */
+EthernetServerStream::EthernetServerStream(IPAddress localip, uint16_t port)
+  : localip(localip),
+    port(port),
+    connected(false)
+{
+}
+
+bool EthernetServerStream::connect_client()
+  {
+    if ( connected )
+    {
+      if ( client && client.connected() ) return true;
+      stop();
+    }
+
+    EthernetClient newClient = server.available();
+    if ( !newClient ) return false;
+    client = newClient;
+    connected = true;
+    DEBUG_PRINTLN("Connected");
+    return true;
+  }
+
+int
+EthernetServerStream::available()
+{
+  return maintain() ? client.available() : 0;
+}
+
+int
+EthernetServerStream::read()
+{
+  return maintain() ? client.read() : -1;
+}
+
+int
+EthernetServerStream::peek()
+{
+  return maintain() ? client.peek() : -1;
+}
+
+void EthernetServerStream::flush()
+{
+  if (maintain())
+    client.flush();
+}
+
+size_t
+EthernetServerStream::write(uint8_t c)
+{
+  return maintain() ? client.write(c) : 0;
+}
+
+void
+EthernetServerStream::maintain(IPAddress localip)
+{
+  // ensure the local IP is updated in the case that it is changed by the DHCP server
+  if (this->localip != localip) {
+    this->localip = localip;
+    if (connected)
+      stop();
+  }
+}
+
+void
+EthernetServerStream::stop()
+{
+  if(client)
+  {
+    client.stop();
+  }
+  connected = false;
+}
+
+bool
+EthernetServerStream::maintain()
+{
+  if (connect_client()) return true;
+  
+  stop();
+  
+  if(!listening)
+  {
+    server = EthernetServer(port);
+    server.begin();
+    listening = true;
+  }
+  return false;
+}
+
+#endif /* ETHERNETSERVERSTREAM_H */