Merge branch 'master' into core-ble

Author: Owen L - SFE

libraries/Wire/keywords.txt

@@ -17,6 +17,8 @@ requestFrom	KEYWORD2
 onReceive	KEYWORD2
 onRequest	KEYWORD2
 setClock	KEYWORD2
+setPullups	KEYWORD2
+
 
 #######################################
 # Instances (KEYWORD2)

libraries/Wire/src/Wire.cpp

@@ -30,77 +30,81 @@ SOFTWARE.
 
 #define AP3_WIRE_RX_BUFFER_LEN 256
 #define AP3_WIRE_TX_BUFFER_LEN 256
-#define AP3_WIRE_LINEAR_BUFFER_LEN (AP3_WIRE_RX_BUFFER_LEN+AP3_WIRE_TX_BUFFER_LEN)
+#define AP3_WIRE_LINEAR_BUFFER_LEN (AP3_WIRE_RX_BUFFER_LEN + AP3_WIRE_TX_BUFFER_LEN)
 
- // WIRE_HAS_END means Wire has end()
+// WIRE_HAS_END means Wire has end()
 #define WIRE_HAS_END 1
 
-class TwoWire : public Stream, public IOMaster {
-  public:
-    TwoWire(uint8_t iom_instance);
-    void begin();
-    void begin(uint8_t, bool enableGeneralCall = false);
-    void end();
-    void setClock(uint32_t);
-
-    void beginTransmission(uint8_t address);
-    uint8_t endTransmission(bool stopBit = true);
-
-    uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit = true);
-
-    size_t write(uint8_t data);
-    size_t write(const uint8_t * data, size_t quantity);
-
-    virtual int available(void);
-    virtual int read(void);
-    virtual int peek(void);
-    virtual void flush(void);
-    void onReceive(void(*)(int));
-    void onRequest(void(*)(void));
-
-    inline size_t write(unsigned long n) { return write((uint8_t)n); }
-    inline size_t write(long n) { return write((uint8_t)n); }
-    inline size_t write(unsigned int n) { return write((uint8_t)n); }
-    inline size_t write(int n) { return write((uint8_t)n); }
-    using Print::write;
-
-    void onService(void);
-
-  private:
-    ap3_gpio_pin_t  _padSDA;
-    ap3_gpio_pin_t  _padSCL;
-
-    bool _transmissionBegun;
-    uint8_t _transmissionAddress;
-
-    
-    RingBufferN<AP3_WIRE_RX_BUFFER_LEN> _rxBuffer;// RX Buffer    
-    RingBufferN<AP3_WIRE_TX_BUFFER_LEN> _txBuffer;// TX buffer
-    uint8_t _linearBugger[AP3_WIRE_LINEAR_BUFFER_LEN]; // ToDo: choose a more efficient way to handle this
-    uint8_t txAddress;
-
-    // Callback user functions
-    void (*_onRequestCallback)(void);
-    void (*_onReceiveCallback)(int);
+class TwoWire : public Stream, public IOMaster
+{
+public:
+  TwoWire(uint8_t iom_instance);
+  void begin();
+  void begin(uint8_t, bool enableGeneralCall = false);
+  void end();
+  void setClock(uint32_t);
+  void setPullups(uint32_t);
+
+  void beginTransmission(uint8_t address);
+  uint8_t endTransmission(bool stopBit = true);
+
+  uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit = true);
+
+  size_t write(uint8_t data);
+  size_t write(const uint8_t *data, size_t quantity);
+
+  virtual int available(void);
+  virtual int read(void);
+  virtual int peek(void);
+  virtual void flush(void);
+  void onReceive(void (*)(int));
+  void onRequest(void (*)(void));
+
+  inline size_t write(unsigned long n) { return write((uint8_t)n); }
+  inline size_t write(long n) { return write((uint8_t)n); }
+  inline size_t write(unsigned int n) { return write((uint8_t)n); }
+  inline size_t write(int n) { return write((uint8_t)n); }
+  using Print::write;
+
+  void onService(void);
+
+private:
+  am_hal_iom_transfer_t iomTransfer = {0};
+  ap3_gpio_pin_t _padSDA;
+  ap3_gpio_pin_t _padSCL;
+
+  bool _transmissionBegun;
+  uint8_t _transmissionAddress;
+  am_hal_gpio_pullup_e _pullups;
+  uint32_t _clockSpeed;
+
+  RingBufferN<AP3_WIRE_RX_BUFFER_LEN> _rxBuffer;     // RX Buffer
+  RingBufferN<AP3_WIRE_TX_BUFFER_LEN> _txBuffer;     // TX buffer
+  uint8_t _linearBugger[AP3_WIRE_LINEAR_BUFFER_LEN]; // ToDo: choose a more efficient way to handle this
+  uint8_t txAddress;
+
+  // Callback user functions
+  void (*_onRequestCallback)(void);
+  void (*_onReceiveCallback)(int);
 };
 
 #if WIRE_INTERFACES_COUNT > 0
-  extern TwoWire Wire;
+extern TwoWire Wire;
 #endif
 #if WIRE_INTERFACES_COUNT > 1
-  extern TwoWire Wire1;
+extern TwoWire Wire1;
 #endif
 #if WIRE_INTERFACES_COUNT > 2
-  extern TwoWire Wire2;
+extern TwoWire Wire2;
 #endif
 #if WIRE_INTERFACES_COUNT > 3
-  extern TwoWire Wire3;
+extern TwoWire Wire3;
 #endif
 #if WIRE_INTERFACES_COUNT > 4
-  extern TwoWire Wire4;
+extern TwoWire Wire4;
 #endif
 #if WIRE_INTERFACES_COUNT > 5
-  extern TwoWire Wire5;
+extern TwoWire Wire5;
 #endif
 
 #endif // _AP3_WIRE_H_

libraries/Wire/src/Wire.h

@@ -0,0 +1,6 @@
+{
+    "name": "framework-arduinoapollo3",
+    "description": "Arduino Wiring-based Framework (Apollo3 Core)",
+    "version": "1.0.23",
+    "url": "https://github.com/sparkfun/Arduino_Apollo3"
+}

package.json

@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 
-#include "himax_driver_HM01B0_Walking1s_01.h"
+#include "HM01B0_Walking1s_01.h"
 #include "am_bsp.h"
 #include "am_mcu_apollo.h"
 #include "am_util.h"

variants/edge/include/hm01b0/HM01B0.c

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_PERSON_DETECTION_HIMAX_DRIVER_HM01B0_RAW8_QVGA_8BITS_LSB_5FPS_H_
 #define TENSORFLOW_LITE_MICRO_EXAMPLES_PERSON_DETECTION_HIMAX_DRIVER_HM01B0_RAW8_QVGA_8BITS_LSB_5FPS_H_
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 
 const hm_script_t sHM01B0InitScript[] = {
     // ;*************************************************************************

variants/edge/include/hm01b0/himax_driver_HM01B0.h renamed to variants/edge/include/hm01b0/HM01B0.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_PERSON_DETECTION_HIMAX_DRIVER_HM01B0_WALKING1S_01_H_
 #define TENSORFLOW_LITE_MICRO_EXAMPLES_PERSON_DETECTION_HIMAX_DRIVER_HM01B0_WALKING1S_01_H_
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 
 const hm_script_t sHM01b0TestModeScript_Walking1s[] = {
     {

variants/edge/include/hm01b0/himax_driver_HM01B0_RAW8_QVGA_8bits_lsb_5fps.h renamed to variants/edge/include/hm01b0/HM01B0_RAW8_QVGA_8bits_lsb_5fps.h

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "himax_driver_HM01B0_debug.h"
+#include "HM01B0_debug.h"
 #include "am_util.h" // NOLINT
 
 void hm01b0_framebuffer_dump(uint8_t* frame, uint32_t length) {

variants/edge/include/hm01b0/himax_driver_HM01B0_Walking1s_01.h renamed to variants/edge/include/hm01b0/HM01B0_Walking1s_01.h

@@ -20,7 +20,7 @@ limitations under the License.
 extern "C" {
 #endif
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 
 //*****************************************************************************
 //

variants/edge/include/hm01b0/himax_driver_HM01B0_Walking1s_01.txt renamed to variants/edge/include/hm01b0/HM01B0_Walking1s_01.txt

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 #include "am_bsp.h" //NOLINT
 #include "am_mcu_apollo.h" //NOLINT
 #include "hm01b0_platform.h" // TARGET specific implementation

variants/edge/include/hm01b0/HM01B0_debug.c

@@ -20,7 +20,7 @@ limitations under the License.
 extern "C" {
 #endif
 
-#include "himax_driver_HM01B0.h"
+#include "HM01B0.h"
 
 //*****************************************************************************
 //