Skip to content

Commit 5ab76b7

Browse files
hathachhathach
authored
Merge pull request #536 from adafruit/update-example
Update example
2 parents d4071f5 + 028629e commit 5ab76b7

File tree

11 files changed

+60
-44
lines changed

11 files changed

+60
-44
lines changed

‎examples/DualRole/CDC/serial_host_bridge/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/HID/hid_device_report/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/HID/hid_mouse_log_filter/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/HID/hid_mouse_tremor_filter/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/HID/hid_remapper/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/MassStorage/msc_data_logger/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/MassStorage/msc_file_explorer/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/DualRole/Simple/device_info/usbh_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static void rp2040_configure_pio_usb(void) {
5959
//while ( !Serial ) delay(10); // wait for native usb
6060
Serial.println("Core1 setup to run TinyUSB host with pio-usb");
6161

62-
// Check for CPU frequency, must be multiple of 120Mhz for bit-banging USB
62+
// Check for CPU frequency, must be multiple of 12 Mhz for bit-banging USB
6363
uint32_t cpu_hz = clock_get_hz(clk_sys);
64-
if (cpu_hz != 120000000UL && cpu_hz != 240000000UL) {
64+
if (cpu_hz % 12000000UL) {
6565
while (!Serial) {
6666
delay(10); // wait for native usb
6767
}
68-
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 120 Mhz\r\n", cpu_hz);
69-
Serial.printf("Change your CPU Clock to either 120 or 240 Mhz in Menu->CPU Speed \r\n");
68+
Serial.printf("Error: CPU Clock = %lu, PIO USB require CPU clock must be multiple of 12 Mhz\r\n", cpu_hz);
69+
Serial.printf("Change your CPU Clock to 12*n Mhz in Menu->CPU Speed \r\n");
7070
while (1) {
7171
delay(1);
7272
}

‎examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ Adafruit_SPIFlash flash(&flashTransport);
6161
#define SDCARD_DETECT 40
6262
#define SDCARD_DETECT_ACTIVE LOW
6363

64+
#elif defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
65+
#define SDIO_CLK_PIN 34
66+
#define SDIO_CMD_PIN 35 // MOSI
67+
#define SDIO_DAT0_PIN 36 // DAT1: 37, DAT2: 38, DAT3: 39
68+
69+
#define SDCARD_DETECT 33
70+
#define SDCARD_DETECT_ACTIVE LOW
71+
6472
#else
6573
// Use SPI, no detect
6674
#define SDCARD_CS 10

‎examples/MassStorage/msc_sdfat/msc_sdfat.ino

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,21 @@
3535
#define SDCARD_DETECT_ACTIVE LOW
3636

3737
#elif defined(ARDUINO_ADAFRUIT_METRO_RP2350)
38-
// Note: not working yet (need troubleshoot later)
3938
#define SDIO_CLK_PIN 34
4039
#define SDIO_CMD_PIN 35 // MOSI
4140
#define SDIO_DAT0_PIN 36 // DAT1: 37, DAT2: 38, DAT3: 39
4241

4342
#define SDCARD_DETECT 40
4443
#define SDCARD_DETECT_ACTIVE LOW
4544

45+
#elif defined(ARDUINO_ADAFRUIT_FRUITJAM_RP2350)
46+
#define SDIO_CLK_PIN 34
47+
#define SDIO_CMD_PIN 35 // MOSI
48+
#define SDIO_DAT0_PIN 36 // DAT1: 37, DAT2: 38, DAT3: 39
49+
50+
#define SDCARD_DETECT 33
51+
#define SDCARD_DETECT_ACTIVE LOW
52+
4653
#else
4754
// Use SPI, no detect
4855
#define SDCARD_CS 10

‎tools/update-usbh_helper.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
from pathlib import Path
2-
import click
2+
import argparse
33
import sys
44
import shutil
55

6-
@click.command()
7-
@click.argument('dir', type=click.Path(), required=True)
8-
def main(dir):
6+
def main():
97
"""
108
This script takes a mandatory 'dir' argument, which is a path to pivot example to update for all DualRole's examples
119
"""
12-
sample_dir = Path(dir)
10+
parser = argparse.ArgumentParser()
11+
parser.add_argument('dpath', help='path to folder containing usbh_helper.h to copy from')
12+
args = parser.parse_args()
13+
14+
dpath = args.dpath
15+
16+
sample_dir = Path(dpath)
1317
if not sample_dir.is_dir():
14-
# add examples/DualRoles to the path
15-
sample_dir = Path('examples/DualRole') / sample_dir
16-
if not sample_dir.is_dir():
17-
click.echo(f"The specified dir '{dir}' does not exist or is not a valid dir.")
18-
sys.exit(1)
18+
print(f"The specified dir '{dir}' does not exist or is not a valid dir.")
19+
sys.exit(1)
1920

2021
sample_file = sample_dir / 'usbh_helper.h'
2122
f_list = sorted(Path('examples/DualRole').glob('**/usbh_helper.h'))
2223
for f in f_list:
2324
if f != sample_file:
24-
click.echo(f"Updating {f}")
25+
print(f"Updating {f}")
2526
shutil.copy(sample_file, f)
2627

2728

0 commit comments

Comments
 (0)