Skip to content

Commit

Permalink
Merge upstream tag 'v24.4.24' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
schlimmchen committed May 2, 2024
2 parents 4cf596e + 4623839 commit 18dab3c
Show file tree
Hide file tree
Showing 7 changed files with 189 additions and 158 deletions.
4 changes: 2 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ build_unflags =
-std=gnu++11

lib_deps =
mathieucarbou/ESP Async WebServer @ 2.9.0
mathieucarbou/ESP Async WebServer @ 2.9.3
bblanchon/ArduinoJson @ ^7.0.4
https://github.com/bertmelis/espMqttClient.git#v1.6.0
nrf24/RF24 @ ^1.4.8
olikraus/U8g2 @ ^2.35.15
olikraus/U8g2 @ ^2.35.17
buelowp/sunset @ ^1.1.7
https://github.com/arkhipenko/TaskScheduler#testing
https://github.com/coryjfowler/MCP_CAN_lib
Expand Down
1 change: 1 addition & 0 deletions src/WebApi_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ void WebApiConfigClass::onConfigGet(AsyncWebServerRequest* request)
requestFile = name;
} else {
request->send(404);
return;
}
}

Expand Down
16 changes: 8 additions & 8 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"mitt": "^3.0.1",
"sortablejs": "^1.15.2",
"spark-md5": "^3.0.2",
"vue": "^3.4.21",
"vue-i18n": "^9.12.0",
"vue-router": "^4.3.0"
"vue": "^3.4.25",
"vue-i18n": "^9.13.1",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@intlify/unplugin-vue-i18n": "^4.0.0",
Expand All @@ -33,16 +33,16 @@
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint": "^9.0.0",
"eslint-plugin-vue": "^9.24.1",
"eslint": "^9.1.1",
"eslint-plugin-vue": "^9.25.0",
"npm-run-all": "^4.1.5",
"pulltorefreshjs": "^0.1.22",
"sass": "^1.75.0",
"terser": "^5.30.3",
"terser": "^5.30.4",
"typescript": "^5.4.5",
"vite": "^5.2.8",
"vite": "^5.2.10",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-css-injected-by-js": "^3.5.0",
"vue-tsc": "^2.0.13"
"vue-tsc": "^2.0.14"
}
}
8 changes: 4 additions & 4 deletions webapp/public/zones.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"America/Santiago":"<-04>4<-03>,M9.1.6/24,M4.1.6/24",
"America/Santo_Domingo":"AST4",
"America/Sao_Paulo":"<-03>3",
"America/Scoresbysund":"<-01>1<+00>,M3.5.0/0,M10.5.0/1",
"America/Scoresbysund":"<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
"America/Sitka":"AKST9AKDT,M3.2.0,M11.1.0",
"America/St_Barthelemy":"AST4",
"America/St_Johns":"NST3:30NDT,M3.2.0,M11.1.0",
Expand All @@ -200,7 +200,7 @@
"America/Winnipeg":"CST6CDT,M3.2.0,M11.1.0",
"America/Yakutat":"AKST9AKDT,M3.2.0,M11.1.0",
"America/Yellowknife":"MST7MDT,M3.2.0,M11.1.0",
"Antarctica/Casey":"<+11>-11",
"Antarctica/Casey":"<+08>-8",
"Antarctica/Davis":"<+07>-7",
"Antarctica/DumontDUrville":"<+10>-10",
"Antarctica/Macquarie":"AEST-10AEDT,M10.1.0,M4.1.0/3",
Expand All @@ -210,10 +210,10 @@
"Antarctica/Rothera":"<-03>3",
"Antarctica/Syowa":"<+03>-3",
"Antarctica/Troll":"<+00>0<+02>-2,M3.5.0/1,M10.5.0/3",
"Antarctica/Vostok":"<+06>-6",
"Antarctica/Vostok":"<+05>-5",
"Arctic/Longyearbyen":"CET-1CEST,M3.5.0,M10.5.0/3",
"Asia/Aden":"<+03>-3",
"Asia/Almaty":"<+06>-6",
"Asia/Almaty":"<+05>-5",
"Asia/Amman":"<+03>-3",
"Asia/Anadyr":"<+12>-12",
"Asia/Aqtau":"<+05>-5",
Expand Down
6 changes: 4 additions & 2 deletions webapp/src/utils/authentication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function login(username: string, password: string) {
});
}

export function handleResponse(response: Response, emitter: Emitter<Record<EventType, unknown>>, router: Router) {
export function handleResponse(response: Response, emitter: Emitter<Record<EventType, unknown>>, router: Router, ignore_error: boolean = false) {
return response.text().then(text => {
const data = text && JSON.parse(text);
if (!response.ok) {
Expand All @@ -78,7 +78,9 @@ export function handleResponse(response: Response, emitter: Emitter<Record<Event
}

const error = { message: (data && data.message) || response.statusText, status: response.status || 0 };
router.push({ name: "Error", params: error });
if (!ignore_error) {
router.push({ name: "Error", params: error });
}
return Promise.reject(error);
}

Expand Down
5 changes: 4 additions & 1 deletion webapp/src/views/DeviceAdminView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export default defineComponent({
getPinMappingList() {
this.pinMappingLoading = true;
fetch("/api/config/get?file=pin_mapping.json", { headers: authHeader() })
.then((response) => handleResponse(response, this.$emitter, this.$router))
.then((response) => handleResponse(response, this.$emitter, this.$router, true))
.then(
(data) => {
this.pinMappingList = data;
Expand All @@ -246,6 +246,9 @@ export default defineComponent({
.then(
(data) => {
this.deviceConfigList = data;
if (this.deviceConfigList.curPin.name === "") {
this.deviceConfigList.curPin.name = "Default";
}
this.dataLoading = false;
}
)
Expand Down
Loading

0 comments on commit 18dab3c

Please sign in to comment.