Skip to content

Commit ffeacc7

Browse files
authored
Merge branch 'espressif:master' into master
2 parents 3881337 + f0ded24 commit ffeacc7

File tree

5 files changed

+65
-2
lines changed

5 files changed

+65
-2
lines changed

boards.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3895,7 +3895,7 @@ um_feathers3neo.build.cdc_on_boot=1
38953895
um_feathers3neo.build.msc_on_boot=0
38963896
um_feathers3neo.build.dfu_on_boot=0
38973897
um_feathers3neo.build.f_cpu=240000000L
3898-
um_feathers3neo.build.flash_size=16MB
3898+
um_feathers3neo.build.flash_size=8MB
38993899
um_feathers3neo.build.flash_freq=80m
39003900
um_feathers3neo.build.flash_mode=dio
39013901
um_feathers3neo.build.boot=qio

libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
#include <WiFi.h>
216
#include <ESPmDNS.h>
317
#include <NetworkUdp.h>

libraries/ArduinoOTA/keywords.txt

+22-1
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,40 @@
77
#######################################
88

99
ArduinoOTA KEYWORD1
10+
ArduinoOTAClass KEYWORD1
1011

1112
#######################################
1213
# Methods and Functions (KEYWORD2)
1314
#######################################
1415

1516
begin KEYWORD2
16-
setup KEYWORD2
17+
end KEYWORD2
1718
handle KEYWORD2
1819
onStart KEYWORD2
1920
onEnd KEYWORD2
2021
onError KEYWORD2
2122
onProgress KEYWORD2
23+
setPort KEYWORD2
24+
setHostname KEYWORD2
25+
getHostname KEYWORD2
26+
setPassword KEYWORD2
27+
setPasswordHash KEYWORD2
28+
setPartitionLabel KEYWORD2
29+
getPartitionLabel KEYWORD2
30+
setRebootOnSuccess KEYWORD2
31+
setMdnsEnabled KEYWORD2
32+
getCommand KEYWORD2
33+
setTimeout KEYWORD2
2234

2335
#######################################
2436
# Constants (LITERAL1)
2537
#######################################
38+
39+
OTA_IDLE LITERAL1
40+
OTA_WAITAUTH LITERAL1
41+
OTA_RUNUPDATE LITERAL1
42+
OTA_AUTH_ERROR LITERAL1
43+
OTA_BEGIN_ERROR LITERAL1
44+
OTA_CONNECT_ERROR LITERAL1
45+
OTA_RECEIVE_ERROR LITERAL1
46+
OTA_END_ERROR LITERAL1

libraries/ArduinoOTA/src/ArduinoOTA.cpp

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
#ifndef LWIP_OPEN_SRC
216
#define LWIP_OPEN_SRC
317
#endif

libraries/ArduinoOTA/src/ArduinoOTA.h

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
#ifndef __ARDUINO_OTA_H
216
#define __ARDUINO_OTA_H
317

0 commit comments

Comments
 (0)