Skip to content

Commit e3cd83d

Browse files
committed
more rename
1 parent f2aeeac commit e3cd83d

File tree

5 files changed

+35
-14
lines changed

5 files changed

+35
-14
lines changed

.github/workflows/githubci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
- 'feather_esp32s3'
5151
# ESP32S2
5252
- 'feather_esp32s2'
53-
- 'metroesp32s2'
5453
# nRF52
5554
- 'cpb'
5655
- 'nrf52840'

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
i2cget i2cset i2cdump i2ctransfer or using any driver/tools that work on i2c device.
5454
*/
5555

56-
#include "Adafruit_WireUSB.h"
56+
#include "Adafruit_USBD_I2C.h"
5757

58-
Adafruit_WireUSB::Adafruit_WireUSB(TwoWire* wire) {
58+
Adafruit_USBD_I2C::Adafruit_USBD_I2C(TwoWire* wire) {
5959
_wire = wire;
6060
_buf = NULL;
6161
_bufsize = 0; // not used to verify length yet
@@ -64,7 +64,7 @@ Adafruit_WireUSB::Adafruit_WireUSB(TwoWire* wire) {
6464
setStringDescriptor("I2C Interface");
6565
}
6666

67-
uint16_t Adafruit_WireUSB::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) {
67+
uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) {
6868
uint8_t desc[] = { TUD_VENDOR_DESCRIPTOR(itfnum, 0, 0x00, 0x80, 64) };
6969
uint16_t const len = sizeof(desc);
7070
if (buf) {
@@ -76,7 +76,7 @@ uint16_t Adafruit_WireUSB::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf,
7676
return len;
7777
}
7878

79-
bool Adafruit_WireUSB::begin(uint8_t* buffer, size_t bufsize) {
79+
bool Adafruit_USBD_I2C::begin(uint8_t* buffer, size_t bufsize) {
8080
_buf = buffer;
8181
_bufsize = (uint16_t) bufsize;
8282

@@ -90,7 +90,7 @@ bool Adafruit_WireUSB::begin(uint8_t* buffer, size_t bufsize) {
9090
return true;
9191
}
9292

93-
uint16_t Adafruit_WireUSB::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bool stop_bit)
93+
uint16_t Adafruit_USBD_I2C::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bool stop_bit)
9494
{
9595
uint16_t const rd_count = (uint16_t) _wire->requestFrom(addr, len, stop_bit);
9696

@@ -106,7 +106,7 @@ uint16_t Adafruit_WireUSB::i2c_read(uint8_t addr, uint8_t* buf, uint16_t len, bo
106106
return rd_count;
107107
}
108108

109-
uint16_t Adafruit_WireUSB::i2c_write(uint8_t addr, uint8_t const* buf, uint16_t len, bool stop_bit)
109+
uint16_t Adafruit_USBD_I2C::i2c_write(uint8_t addr, uint8_t const* buf, uint16_t len, bool stop_bit)
110110
{
111111
_wire->beginTransmission(addr);
112112
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
119119
return wr_count;
120120
}
121121

122-
bool Adafruit_WireUSB::handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
122+
bool Adafruit_USBD_I2C::handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
123123
uint8_t const cmd = request->bRequest;
124124

125125
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
* THE SOFTWARE.
2323
*/
2424

25-
#ifndef ADAFRUIT_WIREUSB_H_
26-
#define ADAFRUIT_WIREUSB_H_
25+
#ifndef ADAFRUIT_USBD_I2C_H_
26+
#define ADAFRUIT_USBD_I2C_H_
2727

2828
#include "Adafruit_TinyUSB.h"
2929
#include "Wire.h"
@@ -85,9 +85,9 @@
8585
#define I2C_STATUS_ACK 1
8686
#define I2C_STATUS_NAK 2
8787

88-
class Adafruit_WireUSB : public Adafruit_USBD_Interface {
88+
class Adafruit_USBD_I2C : public Adafruit_USBD_Interface {
8989
public:
90-
Adafruit_WireUSB(TwoWire* wire);
90+
Adafruit_USBD_I2C(TwoWire* wire);
9191
uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
9292
bool begin(uint8_t* buffer, size_t bufsize);
9393

examples/Vendor/i2c_tiny_usb_adapter/i2c_tiny_usb_adapter.ino

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <Wire.h>
1313
#include "Adafruit_TinyUSB.h"
1414

15-
#include "Adafruit_WireUSB.h"
15+
#include "Adafruit_USBD_I2C.h"
1616

1717
/* This sketch demonstrates how to use tinyusb vendor interface to implement
1818
* i2c-tiny-usb adapter to use with Linux
@@ -45,14 +45,18 @@
4545
4646
- You can then interact with sensor using following commands:
4747
i2cget i2cset i2cdump i2ctransfer or using any driver/tools that work on i2c device.
48+
49+
Adafruit CircuitPython library for PC
50+
- You can use run CircuitPython library with Extended Bus to read sensor data.
51+
- 'i2c_usb.py' is provided a sample script
4852
*/
4953

5054
static uint8_t i2c_buf[800];
5155

5256
#define MyWire Wire
5357
//#define MyWire Wire1
5458

55-
Adafruit_WireUSB i2c_usb(&MyWire);
59+
Adafruit_USBD_I2C i2c_usb(&MyWire);
5660

5761
void setup() {
5862
Serial.begin(115200);
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#! /usr/bin/env python3
2+
#
3+
# before running, install required libraries:
4+
# pip3 install adafruit-extended-bus
5+
# pip3 install adafruit-circuitpython-bme280
6+
7+
import time
8+
import adafruit_extended_bus
9+
from adafruit_bme280 import basic as adafruit_bme280
10+
11+
# Run "i2cdetect -l" to find your bus number
12+
i2c_usb = adafruit_extended_bus.ExtendedI2C(8)
13+
bme280 = adafruit_bme280.Adafruit_BME280_I2C(i2c_usb)
14+
while 1:
15+
print("\nTemperature: %0.1f C" % bme280.temperature)
16+
print("Humidity: %0.1f %%" % bme280.humidity)
17+
print("Pressure: %0.1f hPa" % bme280.pressure)
18+
time.sleep(1)

0 commit comments

Comments
 (0)