Skip to content

Commit

Permalink
Merge pull request #1407 from proddy/dev
Browse files Browse the repository at this point in the history 
remove set command (with no args)
  • Loading branch information
@proddy
proddy authored Nov 11, 2023
2 parents e7254bc + 765e6bc commit 7e1f16c
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 40 deletions.
12 changes: 6 additions & 6 deletions interface/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
},
"dependencies": {
"@alova/adapter-xhr": "^1.0.1",
"@babel/core": "^7.23.2",
"@babel/core": "^7.23.3",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.16",
"@mui/material": "^5.14.17",
"@table-library/react-table-library": "4.1.7",
"@types/imagemin": "^8.0.3",
"@types/lodash-es": "^4.17.10",
"@types/node": "^20.8.10",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14",
"@types/imagemin": "^8.0.4",
"@types/lodash-es": "^4.17.11",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/react-router-dom": "^5.3.3",
"alova": "^2.13.1",
"async-validator": "^4.2.5",
Expand Down
145 changes: 121 additions & 24 deletions interface/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.22.1, @babel/core@npm:^7.23.2":
"@babel/core@npm:^7.22.1":
version: 7.23.2
resolution: "@babel/core@npm:7.23.2"
dependencies:
Expand All @@ -69,6 +69,29 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/core@npm:7.23.3"
dependencies:
"@ampproject/remapping": "npm:^2.2.0"
"@babel/code-frame": "npm:^7.22.13"
"@babel/generator": "npm:^7.23.3"
"@babel/helper-compilation-targets": "npm:^7.22.15"
"@babel/helper-module-transforms": "npm:^7.23.3"
"@babel/helpers": "npm:^7.23.2"
"@babel/parser": "npm:^7.23.3"
"@babel/template": "npm:^7.22.15"
"@babel/traverse": "npm:^7.23.3"
"@babel/types": "npm:^7.23.3"
convert-source-map: "npm:^2.0.0"
debug: "npm:^4.1.0"
gensync: "npm:^1.0.0-beta.2"
json5: "npm:^2.2.3"
semver: "npm:^6.3.1"
checksum: f9e7016b62842d23f78c98dc31daa3bd9161c5770c1e9df0557f78186ed75fd2cfc8e7161975fe8c6ad147665b1881790139da91de34ec03cf8b9f6a256d86eb
languageName: node
linkType: hard

"@babel/generator@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/generator@npm:7.23.0"
Expand All @@ -81,6 +104,18 @@ __metadata:
languageName: node
linkType: hard

"@babel/generator@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/generator@npm:7.23.3"
dependencies:
"@babel/types": "npm:^7.23.3"
"@jridgewell/gen-mapping": "npm:^0.3.2"
"@jridgewell/trace-mapping": "npm:^0.3.17"
jsesc: "npm:^2.5.1"
checksum: 0f815d275cb3de97ec4724b959b3c7a67b1cde1861eda6612b50c6ba22565f12536d1f004dd48e7bad5e059751950265c6ff546ef48b7a719a11d7b512f1e29d
languageName: node
linkType: hard

"@babel/helper-annotate-as-pure@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
Expand Down Expand Up @@ -153,6 +188,21 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-module-transforms@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/helper-module-transforms@npm:7.23.3"
dependencies:
"@babel/helper-environment-visitor": "npm:^7.22.20"
"@babel/helper-module-imports": "npm:^7.22.15"
"@babel/helper-simple-access": "npm:^7.22.5"
"@babel/helper-split-export-declaration": "npm:^7.22.6"
"@babel/helper-validator-identifier": "npm:^7.22.20"
peerDependencies:
"@babel/core": ^7.0.0
checksum: 583fa580f8e50e6f45c4f46aa76a8e49c2528deb84e25f634d66461b9a0e2420e13979b0a607b67aef67eaf8db8668eb9edc038b4514b16e3879fe09e8fd294b
languageName: node
linkType: hard

"@babel/helper-plugin-utils@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/helper-plugin-utils@npm:7.22.5"
Expand Down Expand Up @@ -230,6 +280,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/parser@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/parser@npm:7.23.3"
bin:
parser: ./bin/babel-parser.js
checksum: 284c22ec1d939df66fb94929959d2160c30df1ba5778f212668dfb2f4aa8ac176f628c6073a2c9ea7ab2a1701d2ebdafb0dfb173dc737db9dc6708d5d2f49e0a
languageName: node
linkType: hard

"@babel/plugin-syntax-jsx@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
Expand Down Expand Up @@ -305,6 +364,24 @@ __metadata:
languageName: node
linkType: hard

"@babel/traverse@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/traverse@npm:7.23.3"
dependencies:
"@babel/code-frame": "npm:^7.22.13"
"@babel/generator": "npm:^7.23.3"
"@babel/helper-environment-visitor": "npm:^7.22.20"
"@babel/helper-function-name": "npm:^7.23.0"
"@babel/helper-hoist-variables": "npm:^7.22.5"
"@babel/helper-split-export-declaration": "npm:^7.22.6"
"@babel/parser": "npm:^7.23.3"
"@babel/types": "npm:^7.23.3"
debug: "npm:^4.1.0"
globals: "npm:^11.1.0"
checksum: 522ef8eefe1ed31cd392129efb2f8794ca25bd54b1ad7c3bfa7f46d20c47ef0e392d5c1654ddee3454eed5e546d04c9bfa38b04b82e47144aa545f87ba55572d
languageName: node
linkType: hard

"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.8.3":
version: 7.23.0
resolution: "@babel/types@npm:7.23.0"
Expand All @@ -316,6 +393,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.23.3":
version: 7.23.3
resolution: "@babel/types@npm:7.23.3"
dependencies:
"@babel/helper-string-parser": "npm:^7.22.5"
"@babel/helper-validator-identifier": "npm:^7.22.20"
to-fast-properties: "npm:^2.0.0"
checksum: 05ec1527d0468aa6f3e30fa821625322794055fb572c131aaa8befdf24d174407e2e5954c2b0a292a5456962e23383e36cf9d7cbb01318146d6140ce2128d000
languageName: node
linkType: hard

"@emotion/babel-plugin@npm:^11.11.0":
version: 11.11.0
resolution: "@emotion/babel-plugin@npm:11.11.0"
Expand Down Expand Up @@ -1224,7 +1312,7 @@ __metadata:
languageName: node
linkType: hard

"@types/imagemin@npm:*, @types/imagemin@npm:^8.0.3":
"@types/imagemin@npm:*":
version: 8.0.3
resolution: "@types/imagemin@npm:8.0.3"
dependencies:
Expand All @@ -1242,6 +1330,15 @@ __metadata:
languageName: node
linkType: hard

"@types/imagemin@npm:^8.0.4":
version: 8.0.4
resolution: "@types/imagemin@npm:8.0.4"
dependencies:
"@types/node": "npm:*"
checksum: 29c490a18aced93634d9e0b7cb240041cb540bd0bc596c23af4e05be0a3db0681508599a8b6863b025cf91b0a6ca948496bebe041fcd8e90424594f1c562ca9b
languageName: node
linkType: hard

"@types/json-schema@npm:^7.0.12":
version: 7.0.14
resolution: "@types/json-schema@npm:7.0.14"
Expand All @@ -1265,12 +1362,12 @@ __metadata:
languageName: node
linkType: hard

"@types/lodash-es@npm:^4.17.10":
version: 4.17.10
resolution: "@types/lodash-es@npm:4.17.10"
"@types/lodash-es@npm:^4.17.11":
version: 4.17.11
resolution: "@types/lodash-es@npm:4.17.11"
dependencies:
"@types/lodash": "npm:*"
checksum: a6c68872425418491d693186238e22c9da0e88bdf7ffe2b26e5436a19027ffedabeaec162e336b3722d5c43411866e859beae76a1a8f737bb5b115d5a574f758
checksum: 87516f652eb13a544590351dd1986df37929c83d3393491c1b5f0e8d36a604ed9c00d4da9c77df052f38affd9bac33a4534ec52f679989e38bedb595fbbc23bb
languageName: node
linkType: hard

Expand All @@ -1297,12 +1394,12 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^20.8.10":
version: 20.8.10
resolution: "@types/node@npm:20.8.10"
"@types/node@npm:^20.9.0":
version: 20.9.0
resolution: "@types/node@npm:20.9.0"
dependencies:
undici-types: "npm:~5.26.4"
checksum: 8930039077c8ad74de74c724909412bea8110c3f8892bcef8dda3e9629073bed65632ee755f94b252bcdae8ca71cf83e89a4a440a105e2b1b7c9797b43483049
checksum: a934f7645ed117a27857147403b0c657ffbca578c8f280e4c21d27dfb43e58dc4f24c4319d4335b8a4fa08e28fb2dc905a5bd5e4bc8878047164c56c1b162139
languageName: node
linkType: hard

Expand All @@ -1320,12 +1417,12 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18.2.14":
version: 18.2.14
resolution: "@types/react-dom@npm:18.2.14"
"@types/react-dom@npm:^18.2.15":
version: 18.2.15
resolution: "@types/react-dom@npm:18.2.15"
dependencies:
"@types/react": "npm:*"
checksum: c7feb6542dbeb3de18c9c03260229377e0a0d47a3d2c0bb91861996e2353375a45c57de7216edb8b88448584e363677244bd4355ddec45c243e70e777c2a150b
checksum: 57ea7e9e210d95fa18fde82fc585cb6252c9118c8793a38b37b07ccbba05d09d14f88cf76af46eecda41c430b4400f789a4bbc505eec459a15cbaf13f56f887a
languageName: node
linkType: hard

Expand Down Expand Up @@ -1370,14 +1467,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:^18.2.36":
version: 18.2.36
resolution: "@types/react@npm:18.2.36"
"@types/react@npm:^18.2.37":
version: 18.2.37
resolution: "@types/react@npm:18.2.37"
dependencies:
"@types/prop-types": "npm:*"
"@types/scheduler": "npm:*"
csstype: "npm:^3.0.2"
checksum: 4dac0a9f808b0da01029146efe7eeed454da68d01f0f73d417c95d691460f210b9baeb5fa756015f5a048825a1145a7dcb6c6d9c3e4e7876c683edf9892c383b
checksum: fab3a5960e710aad6c16ffe57f48a470c6bbbe9e6363f70accf114191ea3192a204e33b5657324f14e64b2095986327db6b728fc15156e05f7d30b6dca0d66a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -1547,19 +1644,19 @@ __metadata:
resolution: "EMS-ESP@workspace:."
dependencies:
"@alova/adapter-xhr": "npm:^1.0.1"
"@babel/core": "npm:^7.23.2"
"@babel/core": "npm:^7.23.3"
"@emotion/react": "npm:^11.11.1"
"@emotion/styled": "npm:^11.11.0"
"@mui/icons-material": "npm:^5.14.16"
"@mui/material": "npm:^5.14.17"
"@preact/compat": "npm:^17.1.2"
"@preact/preset-vite": "npm:^2.6.0"
"@table-library/react-table-library": "npm:4.1.7"
"@types/imagemin": "npm:^8.0.3"
"@types/lodash-es": "npm:^4.17.10"
"@types/node": "npm:^20.8.10"
"@types/react": "npm:^18.2.36"
"@types/react-dom": "npm:^18.2.14"
"@types/imagemin": "npm:^8.0.4"
"@types/lodash-es": "npm:^4.17.11"
"@types/node": "npm:^20.9.0"
"@types/react": "npm:^18.2.37"
"@types/react-dom": "npm:^18.2.15"
"@types/react-router-dom": "npm:^5.3.3"
"@typescript-eslint/eslint-plugin": "npm:^6.10.0"
"@typescript-eslint/parser": "npm:^6.10.0"
Expand Down
9 changes: 0 additions & 9 deletions src/console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,6 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
"local");
});

commands->add_command(ShellContext::MAIN, CommandFlags::USER, string_vector{F_(set)}, [](Shell & shell, const std::vector<std::string> & arguments) {
to_app(shell).webSettingsService.read([&](WebSettings & settings) {
shell.printfln("Language: %s", settings.locale.c_str());
shell.printfln(F_(tx_mode_fmt), settings.tx_mode);
shell.printfln(F_(bus_id_fmt), settings.ems_bus_id);
shell.printfln(F_(board_profile_fmt), settings.board_profile.c_str());
});
});

//
// EMS device commands
//
Expand Down
1 change: 0 additions & 1 deletion src/locale_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ MAKE_WORD_CUSTOM(EMSESP, "EMS-ESP")
MAKE_WORD_CUSTOM(host_fmt, "Host: %s")
MAKE_WORD_CUSTOM(port_fmt, "Port: %d")
MAKE_WORD_CUSTOM(hostname_fmt, "Hostname: %s")
MAKE_WORD_CUSTOM(board_profile_fmt, "Board Profile: %s")
MAKE_WORD_CUSTOM(mark_interval_fmt, "Mark interval: %lus")
MAKE_WORD_CUSTOM(wifi_ssid_fmt, "WiFi SSID: %s")
MAKE_WORD_CUSTOM(wifi_password_fmt, "WiFi Password: %S")
Expand Down
2 changes: 2 additions & 0 deletions src/system.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,8 @@ void System::show_system(uuid::console::Shell & shell) {
refreshHeapMem(); // refresh free heap and max alloc heap

shell.println("System:");
shell.printfln(" Version: %s", EMSESP_APP_VERSION);
shell.printfln(" Language: %s", locale().c_str());
shell.printfln(" Board profile: %s", board_profile().c_str());
shell.printfln(" Uptime: %s", uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3).c_str());
#ifndef EMSESP_STANDALONE
Expand Down

0 comments on commit 7e1f16c

Please sign in to comment.