forked from external-repos/esp32cam-rtsp
Merge pull request #39 from rzeldent/feature/update_moustache
- Use micro-moustache - Update for node 16
This commit is contained in:
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
@@ -5,9 +5,9 @@ jobs:
|
|||||||
name: Build
|
name: Build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- name: Set up python
|
- name: Set up python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v3
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Build firmware
|
- name: Build firmware
|
||||||
run: platformio run
|
run: platformio run
|
||||||
- name: Archive
|
- name: Archive
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: firmware.bin
|
name: firmware.bin
|
||||||
path: .pio/build/*/firmware.bin
|
path: .pio/build/*/firmware.bin
|
||||||
|
|||||||
@@ -38,4 +38,4 @@ build_flags =
|
|||||||
lib_deps =
|
lib_deps =
|
||||||
prampec/IotWebConf @ ^3.2.1
|
prampec/IotWebConf @ ^3.2.1
|
||||||
geeksville/Micro-RTSP @ ^0.1.6
|
geeksville/Micro-RTSP @ ^0.1.6
|
||||||
rzeldent/micro-moustache @ ^1.0.0
|
rzeldent/micro-moustache@^1.0.1
|
||||||
@@ -70,7 +70,7 @@ void handle_root()
|
|||||||
// Wifi Modes
|
// Wifi Modes
|
||||||
const char *wifi_modes[] = {"NULL", "STA", "AP", "STA+AP"};
|
const char *wifi_modes[] = {"NULL", "STA", "AP", "STA+AP"};
|
||||||
|
|
||||||
const moustache_variable_t substitutions[] = {
|
moustache_variable_t substitutions[] = {
|
||||||
// Config Changed?
|
// Config Changed?
|
||||||
{"ConfigChanged", String(config_changed)},
|
{"ConfigChanged", String(config_changed)},
|
||||||
// Version / CPU
|
// Version / CPU
|
||||||
@@ -128,7 +128,7 @@ void handle_restart()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const moustache_variable_t substitutions[] = {
|
moustache_variable_t substitutions[] = {
|
||||||
{"AppTitle", APP_TITLE},
|
{"AppTitle", APP_TITLE},
|
||||||
{"AppVersion", APP_VERSION},
|
{"AppVersion", APP_VERSION},
|
||||||
{"ThingName", iotWebConf.getThingName()}};
|
{"ThingName", iotWebConf.getThingName()}};
|
||||||
|
|||||||
Reference in New Issue
Block a user