Skip to content

Commit 375fd39

Browse files
committed
address @tyeth review
1 parent ec229aa commit 375fd39

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

src/Wippersnapper_V2.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ void Wippersnapper_V2::provision() {
8080
#ifdef USE_TINYUSB
8181
WsV2._fileSystemV2 = new Wippersnapper_FS();
8282
#elif defined(USE_LITTLEFS)
83-
_littleFSV2 = new WipperSnapper_LittleFS();
83+
WsV2._littleFSV2 = new WipperSnapper_LittleFS();
8484
#endif
8585

8686
// Determine if app is in SDLogger mode
8787
#ifdef USE_TINYUSB
8888
WsV2._fileSystemV2->GetPinSDCS();
8989
#elif defined(USE_LITTLEFS)
90-
_littleFSV2->GetPinSDCS();
90+
WsV2._littleFSV2->GetPinSDCS();
9191
#elif defined(OFFLINE_MODE_WOKWI)
9292
WsV2.pin_sd_cs = 15;
9393
#endif
@@ -126,7 +126,7 @@ void Wippersnapper_V2::provision() {
126126
#ifdef USE_TINYUSB
127127
WsV2._fileSystemV2->ParseFileSecrets();
128128
#elif defined(USE_LITTLEFS)
129-
_littleFSV2->ParseFileSecrets();
129+
WsV2._littleFSV2->ParseFileSecrets();
130130
#else
131131
check_valid_ssid(); // non-fs-backed, sets global credentials within network
132132
// iface

src/components/i2c/hardware.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,19 +181,19 @@ bool I2cHardware::ScanBus(wippersnapper_i2c_I2cBusScanned *scan_results) {
181181
// Check endTransmission()'s return code (Arduino-ESP32 ONLY)
182182
else if (endTransmissionRC == 3) {
183183
WS_DEBUG_PRINTLN("[i2c] Did not find device: NACK on transmit of data!");
184-
return false;
184+
continue;
185185
} else if (endTransmissionRC == 2) {
186186
// WS_DEBUG_PRINTLN("[i2c] Did not find device: NACK on transmit of
187187
// address!");
188188
continue;
189189
} else if (endTransmissionRC == 1) {
190190
WS_DEBUG_PRINTLN(
191191
"[i2c] Did not find device: data too long to fit in xmit buffer!");
192-
return false;
192+
continue;
193193
} else if (endTransmissionRC == 4) {
194194
WS_DEBUG_PRINTLN(
195195
"[i2c] Did not find device: Unspecified bus error occured!");
196-
return false;
196+
continue;
197197
} else if (endTransmissionRC == 5) {
198198
WS_DEBUG_PRINTLN("[i2c] Did not find device: Bus timed out!");
199199
continue;

src/provisioning/sdcard/ws_sdcard.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ ws_sdcard::ws_sdcard() {
5959
did_init = InitSdCard(WsV2.pin_sd_cs);
6060
}
6161

62-
// Case 2: Try to initialize the SD card with the default pin (within
63-
// ws_adapters.h)
62+
// Case 2: Try to initialize the SD card with the default
63+
// board SD CS pin (found within ws_boards.h)
6464
if (!did_init) {
6565
if (InitSdCard(SD_CS_PIN)) {
6666
// Attempt to update the config file with the default pin

src/ws_boards.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,6 @@
203203
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
204204
#define I2c_STEMMA_WIRE1
205205
#define SD_CS_PIN 33
206-
#elif defined(ARDUINO_SAMD_NANO_33_IOT)
207-
#define BOARD_ID "nano-33-iot"
208-
#define USE_STATUS_LED
209-
#define STATUS_LED_PIN 13
210-
#define SD_CS_PIN 33
211-
#elif defined(ARDUINO_SAMD_MKRWIFI1010)
212-
#define BOARD_ID "mkrwifi1010"
213-
#define USE_STATUS_LED
214-
#define STATUS_LED_PIN 6
215-
#define SD_CS_PIN 33
216206
#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
217207
#define BOARD_ID "rpi-pico-w"
218208
#define USE_TINYUSB

0 commit comments

Comments
 (0)