Skip to content

Commit 8482693

Browse files
Don't set SDFAT_FILE_TYPE, default is OK (earlephilhower#2773)
* Don't set SDFAT_FILE_TYPE, default is OK Fixes earlephilhower#2772 No need to set SDFAT_FILE_TYPE=3 as that is the defaulr value with upstream SdFat. Remove it from platform.txt and platform.io build. * Codespell got all techy
1 parent 9480c2a commit 8482693

File tree

11 files changed

+10
-11
lines changed

11 files changed

+10
-11
lines changed

libraries/BTstackLib/examples/LEPeripheral/LEPeripheral.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void deviceDisconnectedCallback(BLEDevice * device) {
8282
@text In BTstack, the Read Callback is first called to query the size of the
8383
Characteristic Value, before it is called to provide the data.
8484
Both times, the size has to be returned. The data is only stored in the provided
85-
buffer, if the buffer argeument is not NULL.
85+
buffer, if the buffer argument is not NULL.
8686
If more than one dynamic Characteristics is used, the value handle is used
8787
to distinguish them.
8888
*/

libraries/LEAmDNS/src/LEAmDNS_Transfer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ bool MDNSResponder::_prepareMDNSMessage(MDNSResponder::stcMDNSSendParameter& p_r
161161
// Prepare header; count answers
162162
stcMDNS_MsgHeader msgHeader(p_rSendParameter.m_u16ID, p_rSendParameter.m_bResponse, 0,
163163
p_rSendParameter.m_bAuthorative);
164-
// If this is a response, the answers are anwers,
164+
// If this is a response, the answers are answers,
165165
// else this is a query or probe and the answers go into auth section
166166
uint16_t& ru16Answers
167167
= (p_rSendParameter.m_bResponse ? msgHeader.m_u16ANCount : msgHeader.m_u16NSCount);

platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ build.espwifitype=
114114
build.debugscript=picoprobe_cmsis_dap.tcl
115115
build.picodebugflags=
116116
build.variantdefines=
117-
build.sdfatdefines=-DFILE_COPY_CONSTRUCTOR_SELECT=FILE_COPY_CONSTRUCTOR_PUBLIC -DUSE_UTF8_LONG_NAMES=1 -DSDFAT_FILE_TYPE=3 -DDISABLE_FS_H_WARNING=1
117+
build.sdfatdefines=-DFILE_COPY_CONSTRUCTOR_SELECT=FILE_COPY_CONSTRUCTOR_PUBLIC -DUSE_UTF8_LONG_NAMES=1 -DDISABLE_FS_H_WARNING=1
118118

119119
# Allow Pico boards to be auto-discovered by the IDE
120120
#discovery.rp2040.pattern={runtime.tools.pqt-python3.path}/python3 -I "{runtime.platform.path}/tools/pluggable_discovery.py"

tools/platformio-build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ def is_pio_build():
229229
# SdFat definitions required for SDFS
230230
("FILE_COPY_CONSTRUCTOR_SELECT", "FILE_COPY_CONSTRUCTOR_PUBLIC"),
231231
("USE_UTF8_LONG_NAMES", "1"),
232-
("SDFAT_FILE_TYPE", "3"),
233232
("DISABLE_FS_H_WARNING", "1")
234233
],
235234

variants/challenger_2040_wifi/ChallengerWiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
5555
// after a sw or hw reset have been performed to ensure that the AT
5656
// interpreter is up and running.
5757
bool Challenger2040WiFiClass::waitForReady() {
58-
int timeout = 20; // Aprox max 2 sec
58+
int timeout = 20; // Approx max 2 sec
5959

6060
_serial->setTimeout(100);
6161
String rdy = _serial->readStringUntil('\n');

variants/challenger_2040_wifi6_ble/ChallengerWiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
6262
// after a sw or hw reset have been performed to ensure that the AT
6363
// interpreter is up and running.
6464
bool Challenger2040WiFiClass::waitForReady() {
65-
int timeout = 20; // Aprox max 2 sec
65+
int timeout = 20; // Approx max 2 sec
6666

6767
_serial->setTimeout(100);
6868
String rdy = _serial->readStringUntil('\n');

variants/challenger_2040_wifi_ble/ChallengerWiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
5555
// after a sw or hw reset have been performed to ensure that the AT
5656
// interpreter is up and running.
5757
bool Challenger2040WiFiClass::waitForReady() {
58-
int timeout = 20; // Aprox max 2 sec
58+
int timeout = 20; // Approx max 2 sec
5959

6060
_serial->setTimeout(100);
6161
String rdy = _serial->readStringUntil('\n');

variants/challenger_2350_wifi6_ble5/ChallengerWiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
5555
// after a sw or hw reset have been performed to ensure that the AT
5656
// interpreter is up and running.
5757
bool Challenger2040WiFiClass::waitForReady() {
58-
int timeout = 20; // Aprox max 2 sec
58+
int timeout = 20; // Approx max 2 sec
5959

6060
_serial->setTimeout(100);
6161
String rdy = _serial->readStringUntil('\n');

variants/challenger_nb_2040_wifi/ChallengerWiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
5555
// after a sw or hw reset have been performed to ensure that the AT
5656
// interpreter is up and running.
5757
bool Challenger2040WiFiClass::waitForReady() {
58-
int timeout = 20; // Aprox max 2 sec
58+
int timeout = 20; // Approx max 2 sec
5959

6060
_serial->setTimeout(100);
6161
String rdy = _serial->readStringUntil('\n');

variants/connectivity_2040_lte_wifi_ble/Connectivity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void iLabsConnectivityClass::flashEspReset() { // Prepare ESP for flashing
195195
// after a sw or hw reset have been performed to ensure that the AT
196196
// interpreter is up and running.
197197
bool iLabsConnectivityClass::waitForEspReady() {
198-
int timeout = 20; // Aprox max 2 sec
198+
int timeout = 20; // Approx max 2 sec
199199

200200
_espSerial->setTimeout(100);
201201
String rdy = _espSerial->readStringUntil('\n');

variants/ilabs_rpico32/Ilabs2040WiFiClass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void Ilabs2040WiFiClass::flashReset() { // Prepare ESP8285 for flashing
5353
// after a sw or hw reset have been performed to ensure that the AT
5454
// interpreter is up and running.
5555
bool Ilabs2040WiFiClass::waitForReady() {
56-
int timeout = 20; // Aprox max 2 sec
56+
int timeout = 20; // Approx max 2 sec
5757

5858
ESP_SERIAL_PORT.begin(DEFAULT_ESP8285_BAUDRATE);
5959
ESP_SERIAL_PORT.setTimeout(100);

0 commit comments

Comments
 (0)