andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1365 from proddy/dev

Browse Source 
3.6.3-dev.5
This commit is contained in:
Proddy
2023-10-29 13:44:42 +01:00
committed by GitHub
parent 222f853616 7ea7a4b25a
commit 6a221e84cc
11 changed files with 658 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

640
interface/.yarn/releases/yarn-4.0.0.cjs → interface/.yarn/releases/yarn-4.0.1.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
interface/.yarnrc.yml
View File

@@ -4,4 +4,4 @@ enableGlobalCache: false
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.0.0.cjs yarnPath: .yarn/releases/yarn-4.0.1.cjs

4
interface/package.json
View File

@@ -35,7 +35,7 @@
"alova": "^2.13.1", "alova": "^2.13.1",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"history": "^5.3.0", "history": "^5.3.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^4.0.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"react": "latest", "react": "latest",
@@ -73,5 +73,5 @@
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.2.1" "vite-tsconfig-paths": "^4.2.1"
}, },
"packageManager": "yarn@4.0.0" "packageManager": "yarn@4.0.1"
} }

2
interface/src/api/authentication.ts
View File

@@ -1,4 +1,4 @@
import jwtDecode from 'jwt-decode'; import { jwtDecode } from 'jwt-decode';
import { ACCESS_TOKEN, alovaInstance } from './endpoints'; import { ACCESS_TOKEN, alovaInstance } from './endpoints';
import type * as H from 'history'; import type * as H from 'history';
import type { Path } from 'react-router-dom'; import type { Path } from 'react-router-dom';

10
interface/yarn.lock
View File

@@ -1558,7 +1558,7 @@ __metadata:
eslint-plugin-react: "npm:^7.33.2" eslint-plugin-react: "npm:^7.33.2"
eslint-plugin-react-hooks: "npm:^4.6.0" eslint-plugin-react-hooks: "npm:^4.6.0"
history: "npm:^5.3.0" history: "npm:^5.3.0"
jwt-decode: "npm:^3.1.2" jwt-decode: "npm:^4.0.0"
lodash-es: "npm:^4.17.21" lodash-es: "npm:^4.17.21"
mime-types: "npm:^2.1.35" mime-types: "npm:^2.1.35"
preact: "npm:^10.18.1" preact: "npm:^10.18.1"
@@ -5503,10 +5503,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"jwt-decode@npm:^3.1.2": "jwt-decode@npm:^4.0.0":
version: 3.1.2 version: 4.0.0
resolution: "jwt-decode@npm:3.1.2" resolution: "jwt-decode@npm:4.0.0"
checksum: 20a4b072d44ce3479f42d0d2c8d3dabeb353081ba4982e40b83a779f2459a70be26441be6c160bfc8c3c6eadf9f6380a036fbb06ac5406b5674e35d8c4205eeb checksum: 87b569e4a9a0067fb0d592bcf3b2ac3e638e49beee28620eeb07bef1b4470f4077dea68c15d191dd68e076846c3af8394be3bcaecffedc6e97433b221fdbbcf3
languageName: node languageName: node
linkType: hard linkType: hard

640
mock-api/.yarn/releases/yarn-4.0.0.cjs → mock-api/.yarn/releases/yarn-4.0.1.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
mock-api/.yarnrc.yml
View File

@@ -4,4 +4,4 @@ enableGlobalCache: false
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.0.0.cjs yarnPath: .yarn/releases/yarn-4.0.1.cjs

2
mock-api/package.json
View File

@@ -15,5 +15,5 @@
"express": "^4.18.2", "express": "^4.18.2",
"multer": "^1.4.5-lts.1" "multer": "^1.4.5-lts.1"
}, },
"packageManager": "yarn@4.0.0" "packageManager": "yarn@4.0.1"
} }

5
scripts/api_test.http
View File

@@ -1,6 +1,7 @@
# testing EMS-ESP API # testing EMS-ESP API
# use with "REST Client" extension in Visual Studio Code # to be used with "REST Client" extension in Visual Studio Code (https://marketplace.visualstudio.com/items?itemName=humao.rest-client)
# https://marketplace.visualstudio.com/items?itemName=humao.rest-client # Open this file in VSC, modify the token, go to the API call and click on 'Send Request' (or Ctrl+Alt+R)
# The response will be shown in the right panel
@host = http://ems-esp.local @host = http://ems-esp.local
@host_dev = http://ems-esp2.local @host_dev = http://ems-esp2.local

6
src/command.cpp
View File

@@ -338,12 +338,12 @@ uint8_t Command::call(const uint8_t device_type, const char * cmd, const char *
snprintf(info_s, sizeof(info_s), "'%s/%s'", dname, cmd); snprintf(info_s, sizeof(info_s), "'%s/%s'", dname, cmd);
} }
if ((value == nullptr) || (strlen(value) == 0)) { if ((value == nullptr) || (strlen(value) == 0)) {
LOG_WARNING(("%sCalling command %s"), ro.c_str(), info_s); LOG_INFO(("%sCalling command %s"), ro.c_str(), info_s);
} else { } else {
if (id > 0) { if (id > 0) {
LOG_WARNING(("%sCalling command %s with value %s and id %d on device 0x%02X"), ro.c_str(), info_s, value, id, device_id); LOG_INFO(("%sCalling command %s with value %s and id %d on device 0x%02X"), ro.c_str(), info_s, value, id, device_id);
} else { } else {
LOG_WARNING(("%sCalling command %s with value %s"), ro.c_str(), info_s, value); LOG_INFO(("%sCalling command %s with value %s"), ro.c_str(), info_s, value);
} }
} }

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.3-dev.4" #define EMSESP_APP_VERSION "3.6.3-dev.5"