8000 Merge branch 'master' into master · tttapa/arduino-esp32@bbe6d9b · GitHub
[go: up one dir, main page]
Skip to content

Commit bbe6d9b

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into master
2 parents 2231f96 + 6674675 commit bbe6d9b

File tree

203 files changed

+852
-728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+852
-728
lines changed

‎.github/scripts/on-pages.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,15 @@ function git_safe_upload_to_pages(){
8787

8888
EVENT_JSON=`cat $GITHUB_EVENT_PATH`
8989

90+
echo "GITHUB_EVENT_PATH: $GITHUB_EVENT_PATH"
91+
echo "EVENT_JSON: $EVENT_JSON"
92+
9093
pages_added=`echo "$EVENT_JSON" | jq -r '.commits[].added[]'`
94+
echo "added: $pages_added"
9195
pages_modified=`echo "$EVENT_JSON" | jq -r '.commits[].modified[]'`
96+
echo "modified: $pages_modified"
9297
pages_removed=`echo "$EVENT_JSON" | jq -r '.commits[].removed[]'`
98+
echo "removed: $pages_removed"
9399

94100
for page in $pages_added; do
95101
if [[ $page != "README.md" && $page != "docs/"* ]]; then

‎.github/stale.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ onlyLabels: []
1212

1313
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1414
exemptLabels:
15-
- pinned
16-
- security
17-
- "to be implemented"
18-
- "for reference"
19-
- "move to PR"
20-
- "enhancement"
15+
- "Type: For reference"
16+
- "Type: To be implemented"
17+
- "Type: Feature request"
2118

2219
# Set to true to ignore issues in a project (defaults to false)
2320
exemptProjects: false
@@ -29,7 +26,7 @@ exemptMilestones: false
2926
exemptAssignees: false
3027

3128
# Label to use when marking as stale
32-
staleLabel: stale
29+
staleLabel: Status: Stale
3330

3431
# Comment to post when marking as stale. Set to `false` to disable
3532
markComment: >

‎.github/workflows/gh-pages.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ on:
44
push:
55
branches:
66
- master
7+
- pages
78
paths:
89
- 'README.md'
910
- 'docs/**'
11+
- '.github/scripts/on-pages.sh'
12+
- '.github/workflows/gh-pages.yml'
1013

1114
jobs:
1215

‎boards.txt

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ lolin32-lite.serial.disableRTS=true
15511551
lolin32-lite.build.mcu=esp32
15521552
lolin32-lite.build.core=esp32
15531553
lolin32-lite.build.variant=lolin32-lite
1554-
lolin32-lite.build.board=LOLIN32 Lite
1554+
lolin32-lite.build.board=LOLIN32_LITE
15551555

15561556
lolin32-lite.build.f_cpu=240000000L
15571557
lolin32-lite.build.flash_mode=dio
@@ -6203,65 +6203,65 @@ healthypi4.menu.DebugLevel.verbose.build.code_debug=5
62036203
##############################################################
62046204

62056205

6206-
ETBoard.name=ETBoard
6207-
6208-
ETBoard.upload.tool=esptool_py
6209-
ETBoard.upload.maximum_size=1310720
6210-
ETBoard.upload.maximum_data_size=327680
6211-
ETBoard.upload.wait_for_upload_port=true
6212-
6213-
ETBoard.serial.disableDTR=true
6214-
ETBoard.serial.disableRTS=true
6215-
6216-
ETBoard.build.mcu=esp32
6217-
ETBoard.build.core=esp32
6218-
ETBoard.build.variant=ETBoard
6219-
ETBoard.build.board=ETBoard
6220-
ETBoard.build.f_cpu=240000000L
6221-
ETBoard.build.flash_mode=dio
6222-
ETBoard.build.flash_size=4MB
6223-
ETBoard.build.boot=dio
6224-
ETBoard.build.partitions=default
6225-
ETBoard.build.defines=
6226-
6227-
ETBoard.menu.PartitionScheme.default=Default
6228-
ETBoard.menu.PartitionScheme.default.build.partitions=default
6229-
ETBoard.menu.PartitionScheme.no_ota=No OTA (Large APP)
6230-
ETBoard.menu.PartitionScheme.no_ota.build.partitions=no_ota
6231-
ETBoard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
6232-
ETBoard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
6233-
ETBoard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
6234-
ETBoard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
6235-
6236-
ETBoard.menu.FlashFreq.80=80MHz
6237-
ETBoard.menu.FlashFreq.80.build.flash_freq=80m
6238-
ETBoard.menu.FlashFreq.40=40MHz
6239-
ETBoard.menu.FlashFreq.40.build.flash_freq=40m
6240-
6241-
ETBoard.menu.UploadSpeed.921600=921600
6242-
ETBoard.menu.UploadSpeed.921600.upload.speed=921600
6243-
ETBoard.menu.UploadSpeed.115200=115200
6244-
ETBoard.menu.UploadSpeed.115200.upload.speed=115200
6245-
ETBoard.menu.UploadSpeed.256000.windows=256000
6246-
ETBoard.menu.UploadSpeed.256000.upload.speed=256000
6247-
ETBoard.menu.UploadSpeed.230400.windows.upload.speed=256000
6248-
ETBoard.menu.UploadSpeed.230400=230400
6249-
ETBoard.menu.UploadSpeed.230400.upload.speed=230400
6250-
ETBoard.menu.UploadSpeed.460800.linux=460800
6251-
ETBoard.menu.UploadSpeed.460800.macosx=460800
6252-
ETBoard.menu.UploadSpeed.460800.upload.speed=460800
6253-
ETBoard.menu.UploadSpeed.512000.windows=512000
6254-
ETBoard.menu.UploadSpeed.512000.upload.speed=512000
6255-
6256-
ETBoard.menu.DebugLevel.none=None
6257-
ETBoard.menu.DebugLevel.none.build.code_debug=0
6258-
ETBoard.menu.DebugLevel.error=Error
6259-
ETBoard.menu.DebugLevel.error.build.code_debug=1
6260-
ETBoard.menu.DebugLevel.warn=Warn
6261-
ETBoard.menu.DebugLevel.warn.build.code_debug=2
6262-
ETBoard.menu.DebugLevel.info=Info
6263-
ETBoard.menu.DebugLevel.info.build.code_debug=3
6264-
ETBoard.menu.DebugLevel.debug=Debug
6265-
ETBoard.menu.DebugLevel.debug.build.code_debug=4
6266-
ETBoard.menu.DebugLevel.verbose=Verbose
6267-
ETBoard.menu.DebugLevel.verbose.build.code_debug=5
6206+
ET-Board.name=ET-Board
6207+
6208+
ET-Board.upload.tool=esptool_py
6209+
ET-Board.upload.maximum_size=1310720
6210+
ET-Board.upload.maximum_data_size=327680
6211+
ET-Board.upload.wait_for_upload_port=true
6212+
6213+
ET-Board.serial.disableDTR=true
6214+
ET-Board.serial.disableRTS=true
6215+
6216+
ET-Board.build.mcu=esp32
6217+
ET-Board.build.core=esp32
6218+
ET-Board.build.variant=ET-Board
6219+
ET-Board.build.board=ET-Board
6220+
ET-Board.build.f_cpu=240000000L
6221+
ET-Board.build.flash_mode=dio
6222+
ET-Board.build.flash_size=4MB
6223+
ET-Board.build.boot=dio
6224+
ET-Board.build.partitions=default
6225+
ET-Board.build.defines=
6226+
6227+
ET-Board.menu.PartitionScheme.default=Default
6228+
ET-Board.menu.PartitionScheme.default.build.partitions=default
6229+
ET-Board.menu.PartitionScheme.no_ota=No OTA (Large APP)
6230+
ET-Board.menu.PartitionScheme.no_ota.build.partitions=no_ota
6231+
ET-Board.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
6232+
ET-Board.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
6233+
ET-Board.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
6234+
ET-Board.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
6235+
6236+
ET-Board.menu.FlashFreq.80=80MHz
6237+
ET-Board.menu.FlashFreq.80.build.flash_freq=80m
6238+
ET-Board.menu.FlashFreq.40=40MHz
6239+
ET-Board.menu.FlashFreq.40.build.flash_freq=40m
6240+
6241+
ET-Board.menu.UploadSpeed.921600=921600
6242+
ET-Board.menu.UploadSpeed.921600.upload.speed=921600
6243+
ET-Board.menu.UploadSpeed.115200=115200
6244+
ET-Board.menu.UploadSpeed.115200.upload.speed=115200
6245+
ET-Board.menu.UploadSpeed.256000.windows=256000
6246+
ET-Board.menu.UploadSpeed.256000.upload.speed=256000
6247+
ET-Board.menu.UploadSpeed.230400.windows.upload.speed=256000
6248+
ET-Board.menu.UploadSpeed.230400=230400
6249+
ET-Board.menu.UploadSpeed.230400.upload.speed=230400
6250+
ET-Board.menu.UploadSpeed.460800.linux=460800
6251+
ET-Board.menu.UploadSpeed.460800.macosx=460800
6252+
ET-Board.menu.UploadSpeed.460800.upload.speed=460800
6253+
ET-Board.menu.UploadSpeed.512000.windows=512000
6254+
ET-Board.menu.UploadSpeed.512000.upload.speed=512000
6255+
6256+
ET-Board.menu.DebugLevel.none=None
6257+
ET-Board.menu.DebugLevel.none.build.code_debug=0
6258+
ET-Board.menu.DebugLevel.error=Error
6259+
ET-Board.menu.DebugLevel.error.build.code_debug=1
6260+
ET-Board.menu.DebugLevel.warn=Warn
6261+
ET-Board.menu.DebugLevel.warn.build.code_debug=2
6262+
ET-Board.menu.DebugLevel.info=Info
6263+
ET-Board.menu.DebugLevel.info.build.code_debug=3
6264+
ET-Board.menu.DebugLevel.debug=Debug
6265+
ET-Board.menu.DebugLevel.debug.build.code_debug=4
6266+
ET-Board.menu.DebugLevel.verbose=Verbose
6267+
ET-Board.menu.DebugLevel.verbose.build.code_debug=5

‎cores/esp32/Esp.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
// Copyright 2015-2021 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.
1+
/*
2+
Esp.cpp - ESP31B-specific APIs
3+
Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
1419

1520
#include "Arduino.h"
1621
#include "Esp.h"

‎cores/esp32/Esp.h

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
// Copyright 2015-2021 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.
1+
/*
2+
Esp.h - ESP31B-specific APIs
3+
Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
1419

1520
#ifndef ESP_H
1621
#define ESP_H

‎cores/esp32/FunctionalInterrupt.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright 2015-2021 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.
141
/*
152
* FunctionalInterrupt.cpp
163
*

‎cores/esp32/FunctionalInterrupt.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright 2015-2021 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.
141
/*
152
* FunctionalInterrupt.h
163
*

‎cores/esp32/HardwareSerial.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
// Copyright 2015-2021 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-
151
#include <stdlib.h>
162
#include <stdio.h>
173
#include <string.h>

‎cores/esp32/IPv6Address.cpp

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
// Copyright 2015-2021 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
1+
/*
2+
IPv6Address.cpp - Base class that provides IPv6Address
3+
Copyright (c) 2011 Adrian McEwen. All right reserved.
64
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.
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
1419

1520
#include <Arduino.h>
1621
#include <IPv6Address.h>

‎cores/esp32/IPv6Address.h

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
// Copyright 2015-2021 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.
1+
/*
2+
IPv6Address.h - Base class that provides IPv6Address
3+
Copyright (c) 2011 Adrian McEwen. All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
1419

1520
#ifndef IPv6Address_h
1621
#define IPv6Address_h

0 commit comments

Comments
 (0)
0