Skip to content

Commit 68f703e

Browse files
earlephilhowerearlephilhower
authored
Merge branch 'master' into signedupdates
2 parents dd5c2b0 + 6e0c0e3 commit 68f703e

File tree

16 files changed

+301
-33
lines changed

16 files changed

+301
-33
lines changed

‎boards.txt

+169
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,175 @@ huzzah.menu.baud.512000.upload.speed=512000
10191019
huzzah.menu.baud.921600=921600
10201020
huzzah.menu.baud.921600.upload.speed=921600
10211021

1022+
##############################################################
1023+
inventone.name=Invent One
1024+
inventone.build.board=ESP8266_GENERIC
1025+
inventone.build.variant=inventone
1026+
inventone.upload.tool=esptool
1027+
inventone.upload.maximum_data_size=81920
1028+
inventone.upload.wait_for_upload_port=true
1029+
inventone.upload.erase_cmd=
1030+
inventone.serial.disableDTR=true
1031+
inventone.serial.disableRTS=true
1032+
inventone.build.mcu=esp8266
1033+
inventone.build.core=esp8266
1034+
inventone.build.spiffs_pagesize=256
1035+
inventone.build.debug_port=
1036+
inventone.build.debug_level=
1037+
inventone.menu.xtal.80=80 MHz
1038+
inventone.menu.xtal.80.build.f_cpu=80000000L
1039+
inventone.menu.xtal.160=160 MHz
1040+
inventone.menu.xtal.160.build.f_cpu=160000000L
1041+
inventone.menu.vt.flash=Flash
1042+
inventone.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
1043+
inventone.menu.vt.heap=Heap
1044+
inventone.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
1045+
inventone.menu.vt.iram=IRAM
1046+
inventone.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
1047+
inventone.upload.resetmethod=nodemcu
1048+
inventone.build.flash_mode=dio
1049+
inventone.build.flash_freq=40
1050+
inventone.menu.eesz.4M=4M (no SPIFFS)
1051+
inventone.menu.eesz.4M.build.flash_size=4M
1052+
inventone.menu.eesz.4M.build.flash_size_bytes=0x400000
1053+
inventone.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
1054+
inventone.menu.eesz.4M.build.spiffs_pagesize=256
1055+
inventone.menu.eesz.4M.upload.maximum_size=1044464
1056+
inventone.menu.eesz.4M.build.rfcal_addr=0x3FC000
1057+
inventone.menu.eesz.4M1M=4M (1M SPIFFS)
1058+
inventone.menu.eesz.4M1M.build.flash_size=4M
1059+
inventone.menu.eesz.4M1M.build.flash_size_bytes=0x400000
1060+
inventone.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
1061+
inventone.menu.eesz.4M1M.build.spiffs_pagesize=256
1062+
inventone.menu.eesz.4M1M.upload.maximum_size=1044464
1063+
inventone.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
1064+
inventone.menu.eesz.4M1M.build.spiffs_start=0x300000
1065+
inventone.menu.eesz.4M1M.build.spiffs_end=0x3FB000
1066+
inventone.menu.eesz.4M1M.build.spiffs_blocksize=8192
1067+
inventone.menu.eesz.4M2M=4M (2M SPIFFS)
1068+
inventone.menu.eesz.4M2M.build.flash_size=4M
1069+
inventone.menu.eesz.4M2M.build.flash_size_bytes=0x400000
1070+
inventone.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
1071+
inventone.menu.eesz.4M2M.build.spiffs_pagesize=256
1072+
inventone.menu.eesz.4M2M.upload.maximum_size=1044464
1073+
inventone.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
1074+
inventone.menu.eesz.4M2M.build.spiffs_start=0x200000
1075+
inventone.menu.eesz.4M2M.build.spiffs_end=0x3FB000
1076+
inventone.menu.eesz.4M2M.build.spiffs_blocksize=8192
1077+
inventone.menu.eesz.4M3M=4M (3M SPIFFS)
1078+
inventone.menu.eesz.4M3M.build.flash_size=4M
1079+
inventone.menu.eesz.4M3M.build.flash_size_bytes=0x400000
1080+
inventone.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
1081+
inventone.menu.eesz.4M3M.build.spiffs_pagesize=256
1082+
inventone.menu.eesz.4M3M.upload.maximum_size=1044464
1083+
inventone.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
1084+
inventone.menu.eesz.4M3M.build.spiffs_start=0x100000
1085+
inventone.menu.eesz.4M3M.build.spiffs_end=0x3FB000
1086+
inventone.menu.eesz.4M3M.build.spiffs_blocksize=8192
1087+
inventone.menu.ip.lm2f=v2 Lower Memory
1088+
inventone.menu.ip.lm2f.build.lwip_include=lwip2/include
1089+
inventone.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
1090+
inventone.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1
1091+
inventone.menu.ip.hb2f=v2 Higher Bandwidth
1092+
inventone.menu.ip.hb2f.build.lwip_include=lwip2/include
1093+
inventone.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
1094+
inventone.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1
1095+
inventone.menu.ip.lm2n=v2 Lower Memory (no features)
1096+
inventone.menu.ip.lm2n.build.lwip_include=lwip2/include
1097+
inventone.menu.ip.lm2n.build.lwip_lib=-llwip2-536
1098+
inventone.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0
1099+
inventone.menu.ip.hb2n=v2 Higher Bandwidth (no features)
1100+
inventone.menu.ip.hb2n.build.lwip_include=lwip2/include
1101+
inventone.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
1102+
inventone.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0
1103+
inventone.menu.ip.hb1=v1.4 Higher Bandwidth
1104+
inventone.menu.ip.hb1.build.lwip_lib=-llwip_gcc
1105+
inventone.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
1106+
inventone.menu.ip.src=v1.4 Compile from source
1107+
inventone.menu.ip.src.build.lwip_lib=-llwip_src
1108+
inventone.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
1109+
inventone.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
1110+
inventone.menu.dbg.Disabled=Disabled
1111+
inventone.menu.dbg.Disabled.build.debug_port=
1112+
inventone.menu.dbg.Serial=Serial
1113+
inventone.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
1114+
inventone.menu.dbg.Serial1=Serial1
1115+
inventone.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
1116+
inventone.menu.lvl.None____=None
1117+
inventone.menu.lvl.None____.build.debug_level=
1118+
inventone.menu.lvl.SSL=SSL
1119+
inventone.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
1120+
inventone.menu.lvl.TLS_MEM=TLS_MEM
1121+
inventone.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
1122+
inventone.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
1123+
inventone.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
1124+
inventone.menu.lvl.HTTP_SERVER=HTTP_SERVER
1125+
inventone.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
1126+
inventone.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
1127+
inventone.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
1128+
inventone.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
1129+
inventone.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
1130+
inventone.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
1131+
inventone.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
1132+
inventone.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
1133+
inventone.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
1134+
inventone.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
1135+
inventone.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
1136+
inventone.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
1137+
inventone.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
1138+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
1139+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
1140+
inventone.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
1141+
inventone.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
1142+
inventone.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
1143+
inventone.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
1144+
inventone.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
1145+
inventone.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
1146+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
1147+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
1148+
inventone.menu.lvl.CORE=CORE
1149+
inventone.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
1150+
inventone.menu.lvl.WIFI=WIFI
1151+
inventone.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
1152+
inventone.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
1153+
inventone.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
1154+
inventone.menu.lvl.UPDATER=UPDATER
1155+
inventone.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
1156+
inventone.menu.lvl.OTA=OTA
1157+
inventone.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
1158+
inventone.menu.lvl.OOM=OOM
1159+
inventone.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
1160+
inventone.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
1161+
inventone.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
1162+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
1163+
inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
1164+
inventone.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
1165+
inventone.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
1166+
inventone.menu.wipe.none=Only Sketch
1167+
inventone.menu.wipe.none.upload.erase_cmd=
1168+
inventone.menu.wipe.sdk=Sketch + WiFi Settings
1169+
inventone.menu.wipe.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
1170+
inventone.menu.wipe.all=All Flash Contents
1171+
inventone.menu.wipe.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
1172+
inventone.menu.baud.115200=115200
1173+
inventone.menu.baud.115200.upload.speed=115200
1174+
inventone.menu.baud.9600=9600
1175+
inventone.menu.baud.9600.upload.speed=9600
1176+
inventone.menu.baud.57600=57600
1177+
inventone.menu.baud.57600.upload.speed=57600
1178+
inventone.menu.baud.230400.linux=230400
1179+
inventone.menu.baud.230400.macosx=230400
1180+
inventone.menu.baud.230400.upload.speed=230400
1181+
inventone.menu.baud.256000.windows=256000
1182+
inventone.menu.baud.256000.upload.speed=256000
1183+
inventone.menu.baud.460800.linux=460800
1184+
inventone.menu.baud.460800.macosx=460800
1185+
inventone.menu.baud.460800.upload.speed=460800
1186+
inventone.menu.baud.512000.windows=512000
1187+
inventone.menu.baud.512000.upload.speed=512000
1188+
inventone.menu.baud.921600=921600
1189+
inventone.menu.baud.921600.upload.speed=921600
1190+
10221191
##############################################################
10231192
cw01.name=XinaBox CW01
10241193
cw01.build.board=ESP8266_GENERIC

‎cores/esp8266/core_esp8266_si2c.c

+9-10
Original file line numberDiff line numberDiff line change
@@ -293,24 +293,23 @@ unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned i
293293
}
294294

295295
uint8_t twi_status() {
296-
if (SCL_READ()==0) {
296+
if (SCL_READ() == 0)
297297
return I2C_SCL_HELD_LOW; // SCL held low by another device, no procedure available to recover
298-
}
298+
299299
int clockCount = 20;
300-
while (SDA_READ()==0 && clockCount>0) { // if SDA low, read the bits slaves have to sent to a max
300+
while (SDA_READ() == 0 && clockCount-- > 0) { // if SDA low, read the bits slaves have to sent to a max
301301
twi_read_bit();
302-
if (SCL_READ()==0) {
302+
if (SCL_READ() == 0) {
303303
return I2C_SCL_HELD_LOW_AFTER_READ; // I2C bus error. SCL held low beyond slave clock stretch time
304304
}
305305
}
306-
if (SDA_READ()==0) {
306+
if (SDA_READ() == 0)
307307
return I2C_SDA_HELD_LOW; // I2C bus error. SDA line held low by slave/another_master after n bits.
308-
}
309-
if (!twi_write_start()) {
308+
309+
if (!twi_write_start())
310310
return I2C_SDA_HELD_LOW_AFTER_INIT; // line busy. SDA again held low by another device. 2nd master?
311-
} else {
312-
return I2C_OK;
313-
}
311+
312+
return I2C_OK;
314313
}
315314

316315
uint8_t twi_transmit(const uint8_t* data, uint8_t length)

‎cores/esp8266/core_esp8266_waveform.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
282282
// Check for timed-out waveforms out of the high-frequency toggle loop
283283
for (size_t i = 0; i < countof(waveform); i++) {
284284
Waveform *wave = &waveform[i];
285-
if (wave->timeLeftCycles) {
285+
if (wave->enabled && wave->timeLeftCycles) {
286286
// Check for unsigned underflow with new > old
287287
if (deltaCycles >= wave->timeLeftCycles) {
288288
// Done, remove!

‎doc/boards.rst

+7
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,13 @@ The Adafruit Feather HUZZAH ESP8266 is an Arduino-compatible Wi-Fi development b
219219

220220
Product page: https://www.adafruit.com/product/2821
221221

222+
Invent One
223+
----------
224+
225+
The Invent One is an Arduino-compatible Wi-Fi development board powered by Ai-Thinker's ESP-12F, clocked at 80 MHz at 3.3V logic. It has an onboard ADC (PCF8591) so that you can have multiple analog inputs to work with. More information can be found here: https://blog.inventone.ng
226+
227+
Product page: https://inventone.ng
228+
222229
XinaBox CW01
223230
------------
224231

‎doc/filesystem.rst

+29-9
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Directory object (Dir)
278278
----------------------
279279

280280
The purpose of *Dir* object is to iterate over files inside a directory.
281-
It provides three methods: ``next()``, ``fileName()``, and
281+
It provides the methods: ``next()``, ``fileName()``, ``fileSize()`` , and
282282
``openFile(mode)``.
283283

284284
The following example shows how it should be used:
@@ -288,21 +288,41 @@ The following example shows how it should be used:
288288
Dir dir = SPIFFS.openDir("/data");
289289
while (dir.next()) {
290290
Serial.print(dir.fileName());
291-
File f = dir.openFile("r");
292-
Serial.println(f.size());
291+
if(dir.fileSize()) {
292+
File f = dir.openFile("r");
293+
Serial.println(f.size());
294+
}
293295
}
294296
295-
``dir.next()`` returns true while there are files in the directory to
296-
iterate over. It must be called before calling ``fileName`` and
297-
``openFile`` functions.
297+
next
298+
~~~~
299+
300+
Returns true while there are files in the directory to
301+
iterate over. It must be called before calling ``fileName()``, ``fileSize()``,
302+
and ``openFile()`` functions.
303+
304+
fileName
305+
~~~~~~~~~
306+
307+
Returns the name of the current file pointed to
308+
by the internal iterator.
309+
310+
fileSize
311+
~~~~~~~~
312+
313+
Returns the size of the current file pointed to
314+
by the internal iterator.
315+
316+
openFile
317+
~~~~~~~~
298318

299-
``openFile`` method takes *mode* argument which has the same meaning as
300-
for ``SPIFFS.open`` function.
319+
This method takes *mode* argument which has the same meaning as
320+
for ``SPIFFS.open()`` function.
301321

302322
File object
303323
-----------
304324

305-
``SPIFFS.open`` and ``dir.openFile`` functions return a *File* object.
325+
``SPIFFS.open()`` and ``dir.openFile()`` functions return a *File* object.
306326
This object supports all the functions of *Stream*, so you can use
307327
``readBytes``, ``findUntil``, ``parseInt``, ``println``, and all other
308328
*Stream* methods.

‎libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const uint16_t port = 17;
1313

1414
void setup() {
1515
Serial.begin(115200);
16-
delay(10);
1716

1817
// We start by connecting to a WiFi network
1918

‎libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ ESP8266WiFiMulti WiFiMulti;
1717

1818
void setup() {
1919
Serial.begin(115200);
20-
delay(10);
2120

2221
// We start by connecting to a WiFi network
2322
WiFi.mode(WIFI_STA);

‎libraries/ESP8266WiFi/examples/WiFiHTTPSServer/WiFiHTTPSServer.ino

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ WiFiServerSecure server(443);
114114

115115
void setup() {
116116
Serial.begin(115200);
117-
delay(10);
118117

119118
// prepare GPIO2
120119
pinMode(2, OUTPUT);

‎libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ESP8266WiFiMulti wifiMulti;
1010

1111
void setup() {
1212
Serial.begin(115200);
13-
delay(10);
1413

1514
WiFi.mode(WIFI_STA);
1615
wifiMulti.addAP("ssid_from_AP_1", "your_password_for_AP_1");

‎libraries/ESP8266WiFi/examples/WiFiWebServer/WiFiWebServer.ino

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ WiFiServer server(80);
1818

1919
void setup() {
2020
Serial.begin(115200);
21-
delay(10);
2221

2322
// prepare GPIO2
2423
pinMode(2, OUTPUT);

‎libraries/Wire/Wire.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void TwoWire::flush(void){
212212
txBufferLength = 0;
213213
}
214214

215-
void TwoWire::onReceiveService(uint8_t* inBytes, int numBytes)
215+
void TwoWire::onReceiveService(uint8_t* inBytes, size_t numBytes)
216216
{
217217
// don't bother if user hasn't registered a callback
218218
if (!user_onReceive) {

‎libraries/Wire/Wire.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TwoWire : public Stream
4747
static void (*user_onRequest)(void);
4848
static void (*user_onReceive)(int);
4949
static void onRequestService(void);
50-
static void onReceiveService(uint8_t*, int);
50+
static void onReceiveService(uint8_t*, size_t);
5151
public:
5252
TwoWire();
5353
void begin(int sda, int scl);

‎package/package_esp8266com_index.template.json

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
{
3333
"name": "Adafruit Feather HUZZAH ESP8266"
3434
},
35+
{
36+
"name": "Invent One"
37+
},
3538
{
3639
"name": "XinaBox CW01"
3740
},

‎tools/boards.txt.py

+17
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,23 @@
325325
'',
326326
'Product page: https://www.adafruit.com/product/2821'
327327
],
328+
}),
329+
( 'inventone', {
330+
'name': 'Invent One',
331+
'opts': {
332+
'.build.board': 'ESP8266_GENERIC',
333+
'.build.variant': 'inventone',
334+
},
335+
'macro': [
336+
'resetmethod_nodemcu',
337+
'flashmode_dio',
338+
'flashfreq_40',
339+
'4M',
340+
],
341+
'desc': [ 'The Invent One is an Arduino-compatible Wi-Fi development board powered by Ai-Thinker\'s ESP-12F, clocked at 80 MHz at 3.3V logic. It has an onboard ADC (PCF8591) so that you can have multiple analog inputs to work with. More information can be found here: https://blog.inventone.ng',
342+
'',
343+
'Product page: https://inventone.ng'
344+
],
328345
}),
329346
( 'cw01', {
330347
'name': 'XinaBox CW01',

0 commit comments

Comments
 (0)