Skip to content

Commit 9d69761

Browse files
Migrated to typescript
1 parent de2f6b8 commit 9d69761

File tree

79 files changed

+7930
-1472
lines changed

Some content is hidden

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

79 files changed

+7930
-1472
lines changed

.eslintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
root: true,
3+
parser: "@typescript-eslint/parser",
4+
plugins: ["@typescript-eslint", "inclusive-language"],
5+
extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
6+
rules: {
7+
"inclusive-language/use-inclusive-words": "error",
8+
},
9+
};

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ jobs:
88
- name: Checkout
99
uses: actions/checkout@v1
1010
- name: Build
11-
run: docker run -v ${PWD}:/opt/esp32-javascript -w /opt/esp32-javascript -t espressif/idf idf.py build
11+
run: |
12+
docker build -t esp32-javascript:latest -f tools/Dockerfile .
13+
docker run -t esp32-javascript:latest bash -c '. ./tools/install-node.sh; idf.py build'

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
build
22
sdkconfig.old*
3-
main/project.cpp
3+
main/project.cpp
4+
node_modules
5+

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

.vscode/c_cpp_properties.json

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
{
2-
"configurations": [
3-
{
4-
"name": "ESP32",
5-
"includePath": [
6-
"${workspaceRoot}/**",
7-
"${workspaceRoot}/components/**",
8-
"${workspaceRoot}/build/**",
9-
"${workspaceRoot}/build/include/**",
10-
"${env:IDF_PATH}/components/**"
11-
],
12-
"intelliSenseMode": "clang-x64",
13-
"browse": {
14-
"path": [
15-
"${workspaceRoot}/**",
16-
"${workspaceRoot}/components/**",
17-
"${workspaceRoot}/build/**",
18-
"${workspaceRoot}/build/include/**",
19-
"${env:IDF_PATH}/components/**"
20-
],
21-
"limitSymbolsToIncludedHeaders": true
22-
},
23-
"cStandard": "c11",
24-
"cppStandard": "c++17"
25-
}
26-
],
27-
"version": 4
2+
"configurations": [
3+
{
4+
"name": "ESP32",
5+
"includePath": [
6+
"${workspaceRoot}/**",
7+
"${workspaceRoot}/components/**",
8+
"${workspaceRoot}/build/**",
9+
"${IDF_PATH}/components/**",
10+
"${IDF_PATH}/../xtensa-esp32-elf/xtensa-esp32-elf/include/",
11+
"${IDF_PATH}/../xtensa-esp32-elf/xtensa-esp32-elf/include/**"
12+
],
13+
"intelliSenseMode": "gcc-x86",
14+
"cStandard": "c18",
15+
"cppStandard": "c++17"
16+
}
17+
],
18+
"enableConfigurationSquiggles": true,
19+
"version": 4
2820
}

.vscode/settings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
"time.h": "c",
3838
"reent.h": "c",
3939
"thread": "cpp",
40-
"cmath": "cpp"
41-
}
40+
"cmath": "cpp",
41+
"string": "cpp",
42+
"*.contiki": "cpp"
43+
},
44+
"C_Cpp.errorSquiggles": "Enabled"
4245
}

.vscode/tasks.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"tasks": [
3+
{
4+
"type": "process",
5+
"label": "C/C++: g++ build active file",
6+
"command": "zsh",
7+
"args": ["-i", "-c", "idf.py build"],
8+
"options": {
9+
"cwd": "${workspaceFolder}",
10+
"env": {
11+
"IDF_PYTHON_ENV_PATH": "/home/marric/.espressif/python_env/idf4.2_py3.8_env"
12+
}
13+
},
14+
"problemMatcher": ["$gcc"],
15+
"group": {
16+
"kind": "build",
17+
"isDefault": true
18+
}
19+
}
20+
],
21+
"version": "2.0.0"
22+
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ add_custom_target(cp_modules ALL
2020
COMMAND scripts/copy-modules.sh
2121
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
2222

23-
spiffs_create_partition_image(storage build/modules FLASH_IN_PROJECT
23+
spiffs_create_partition_image(modules build/modules FLASH_IN_PROJECT
2424
DEPENDS cp_modules)

README.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Use the keyboard shortcut `AltGr + ]` to leave serial monitor.
4646

4747
Now you have installed the pre-configured boot script.
4848

49-
If this is your first install, your onboard LED should blink now. Blinking signals that your board has started a soft ap with the ssid "esp32". With your mobile or desktop connect to the WLAN SSID "esp32" and open http://192.168.4.1/setup (if you have not changed the default credentials your username / password is esp32 / esp32 ).
49+
If this is your first install, your onboard LED should blink now. Blinking signals that your board has started a soft ap with the ssid "esp32". With your mobile or desktop connect to the WLAN SSID "esp32" and open http://192.168.4.1/setup (if you have not changed the default credentials your username / password is esp32 / esp32 ). You can change the default password in `./sdkconfig` by changing the value of `CONFIG_ESP32_JS_BASIC_AUTH_PASSWORD`.
5050

5151
On the Setup page you can configure your WLAN settings and an URL to download your JS main script from.
5252

@@ -80,18 +80,34 @@ See [ESP Build System](https://docs.espressif.com/projects/esp-idf/en/latest/esp
8080
8181
### Clean
8282
83-
You can clean the project with
83+
You can clean the project by executing
8484
8585
```shell
8686
idf.py fullclean
8787
```
8888

89+
### Factory reset
90+
91+
You can erase the persistent flash memory, which will be equivalent to a factory reset, by executing
92+
93+
```shell
94+
idf.py erase_flash
95+
```
96+
8997
## Compatibility
9098

9199
Tested with esp-idf (master branch commit hash 2e14149b).
92100

93101
## API
94-
[API documentation](api.md)
102+
[API documentation](docs/README.md)
103+
104+
### Update docs
105+
106+
Update documentation by executing
107+
108+
```shell
109+
npm run doc
110+
```
95111

96112
## License
97113
See source files.

api.md

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)