Skip to content

Commit 5deecfb

Browse files
committed
fix esp32 printf() format
1 parent 09c4703 commit 5deecfb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ void data_log(void) {
6565
return;
6666
}
6767

68-
static uint32_t last_ms = 0;
69-
uint32_t ms = millis();
68+
static unsigned long last_ms = 0;
69+
unsigned long ms = millis();
7070

7171
if ( ms - last_ms < LOG_INTERVAL ) {
7272
return;
@@ -82,8 +82,8 @@ void data_log(void) {
8282
} else {
8383
int value = analogRead(analogPin);
8484

85-
Serial.printf("%u,%d\r\n", ms, value);
86-
f_log.printf("%u,%d\r\n", ms, value);
85+
Serial.printf("%lu,%d\r\n", ms, value);
86+
f_log.printf("%lu,%d\r\n", ms, value);
8787

8888
f_log.close();
8989
}

src/arduino/Adafruit_USBH_Host.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
#include "Adafruit_TinyUSB_API.h"
3737
#include "Adafruit_USBH_Host.h"
3838

39+
#if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
40+
static void max3421_isr(void);
41+
42+
#if defined(ARDUINO_ARCH_ESP32)
43+
SemaphoreHandle_t max3421_intr_sem;
44+
static void max3421_intr_task(void *param);
45+
#endif
46+
3947
Adafruit_USBH_Host *Adafruit_USBH_Host::_instance = NULL;
4048

4149
Adafruit_USBH_Host::Adafruit_USBH_Host(void) {
@@ -47,14 +55,6 @@ Adafruit_USBH_Host::Adafruit_USBH_Host(void) {
4755
#endif
4856
}
4957

50-
#if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
51-
static void max3421_isr(void);
52-
53-
#if defined(ARDUINO_ARCH_ESP32)
54-
SemaphoreHandle_t max3421_intr_sem;
55-
static void max3421_intr_task(void *param);
56-
#endif
57-
5858
Adafruit_USBH_Host::Adafruit_USBH_Host(SPIClass *spi, int8_t cs, int8_t intr) {
5959
Adafruit_USBH_Host::_instance = this;
6060
_spi = spi;

0 commit comments

Comments
 (0)