more rename

Author: hathach

.github/workflows/githubci.yml

@@ -50,7 +50,6 @@ jobs:
            - 'feather_esp32s3'
            # ESP32S2
            - 'feather_esp32s2'
-           - 'metroesp32s2'
            # nRF52
            - 'cpb'
            - 'nrf52840'

examples/Vendor/i2c_tiny_usb_adapter/Adafruit_WireUSB.cpp renamed to examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.cpp

@@ -53,9 +53,9 @@
      i2cget i2cset i2cdump i2ctransfer or using any driver/tools that work on i2c device.
  */
 
-#include "Adafruit_WireUSB.h"
+#include "Adafruit_USBD_I2C.h"
 
-Adafruit_WireUSB::Adafruit_WireUSB(TwoWire* wire) {
+Adafruit_USBD_I2C::Adafruit_USBD_I2C(TwoWire* wire) {
   _wire = wire;
   _buf = NULL;
   _bufsize = 0; // not used to verify length yet
@@ -64,7 +64,7 @@ Adafruit_WireUSB::Adafruit_WireUSB(TwoWire* wire) {
   setStringDescriptor("I2C Interface");
 }
 
-uint16_t Adafruit_WireUSB::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) {
+uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) {
   uint8_t desc[] = { TUD_VENDOR_DESCRIPTOR(itfnum, 0, 0x00, 0x80, 64) };
   uint16_t const len = sizeof(desc);
   if (buf) {
@@ -76,7 +76,7 @@ uint16_t Adafruit_WireUSB::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf,
   return len;
 }
 
-bool Adafruit_WireUSB::begin(uint8_t* buffer, size_t bufsize) {
+bool Adafruit_USBD_I2C::begin(uint8_t* buffer, size_t bufsize) {
   _buf = buffer;
   _bufsize = (uint16_t) bufsize;
 
@@ -90,7 +90,7 @@ bool Adafruit_WireUSB::begin(uint8_t* buffer, size_t bufsize) {
   return true;
 }
 
-uint16_t Adafruit_WireUSB::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bool stop_bit)
+uint16_t Adafruit_USBD_I2C::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bool stop_bit)
 {
   uint16_t const rd_count = (uint16_t) _wire->requestFrom(addr, len, stop_bit);
 
@@ -106,7 +106,7 @@ uint16_t Adafruit_WireUSB::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bo
   return rd_count;
 }
 
-uint16_t Adafruit_WireUSB::i2c_write(uint8_t addr, uint8_t const* buf, uint16_t len, bool stop_bit)
+uint16_t Adafruit_USBD_I2C::i2c_write(uint8_t addr, uint8_t const* buf, uint16_t len, bool stop_bit)
 {
   _wire->beginTransmission(addr);
   uint16_t wr_count = (uint16_t) _wire->write(buf, len);
@@ -119,7 +119,7 @@ uint16_t Adafruit_WireUSB::i2c_write(uint8_t addr, uint8_t const* buf, uint16_t
   return wr_count;
 }
 
-bool Adafruit_WireUSB::handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
+bool Adafruit_USBD_I2C::handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
   uint8_t const cmd = request->bRequest;
 
   if ( stage == CONTROL_STAGE_SETUP )

examples/Vendor/i2c_tiny_usb_adapter/Adafruit_WireUSB.h renamed to examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.h

@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef ADAFRUIT_WIREUSB_H_
-#define ADAFRUIT_WIREUSB_H_
+#ifndef ADAFRUIT_USBD_I2C_H_
+#define ADAFRUIT_USBD_I2C_H_
 
 #include "Adafruit_TinyUSB.h"
 #include "Wire.h"
@@ -85,9 +85,9 @@
 #define I2C_STATUS_ACK  1
 #define I2C_STATUS_NAK  2
 
-class Adafruit_WireUSB : public Adafruit_USBD_Interface {
+class Adafruit_USBD_I2C : public Adafruit_USBD_Interface {
 public:
-  Adafruit_WireUSB(TwoWire* wire);
+  Adafruit_USBD_I2C(TwoWire* wire);
   uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
   bool begin(uint8_t* buffer, size_t bufsize);
 

examples/Vendor/i2c_tiny_usb_adapter/i2c_tiny_usb_adapter.ino

@@ -12,7 +12,7 @@
 #include <Wire.h>
 #include "Adafruit_TinyUSB.h"
 
-#include "Adafruit_WireUSB.h"
+#include "Adafruit_USBD_I2C.h"
 
 /* This sketch demonstrates how to use tinyusb vendor interface to implement
  * i2c-tiny-usb adapter to use with Linux
@@ -45,14 +45,18 @@
 
    - You can then interact with sensor using following commands:
      i2cget i2cset i2cdump i2ctransfer or using any driver/tools that work on i2c device.
+
+   Adafruit CircuitPython library for PC
+   - You can use run CircuitPython library with Extended Bus to read sensor data.
+   - 'i2c_usb.py' is provided a sample script
  */
 
 static uint8_t i2c_buf[800];
 
 #define MyWire    Wire
 //#define MyWire    Wire1
 
-Adafruit_WireUSB i2c_usb(&MyWire);
+Adafruit_USBD_I2C i2c_usb(&MyWire);
 
 void setup() {
   Serial.begin(115200);

examples/Vendor/i2c_tiny_usb_adapter/i2c_usb.py

@@ -0,0 +1,18 @@
+#! /usr/bin/env python3
+#
+# before running, install required libraries:
+#     pip3 install adafruit-extended-bus
+#     pip3 install adafruit-circuitpython-bme280
+
+import time
+import adafruit_extended_bus
+from adafruit_bme280 import basic as adafruit_bme280
+
+# Run "i2cdetect -l" to find your bus number
+i2c_usb = adafruit_extended_bus.ExtendedI2C(8)
+bme280 = adafruit_bme280.Adafruit_BME280_I2C(i2c_usb)
+while 1:
+    print("\nTemperature: %0.1f C" % bme280.temperature)
+    print("Humidity: %0.1f %%" % bme280.humidity)
+    print("Pressure: %0.1f hPa" % bme280.pressure)
+    time.sleep(1)