From 29d198b46d37e3bec509703b0ec8b427307d4420 Mon Sep 17 00:00:00 2001 From: misa1515 <61636045+misa1515@users.noreply.github.com> Date: Sat, 22 Mar 2025 22:41:41 +0100 Subject: [PATCH 1/7] Update index.ts --- interface/src/i18n/sk/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index 491b6b498..30e957ed3 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -187,7 +187,7 @@ const sk: Translation = { COMPACT: 'Kompaktné', DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení', UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)', - UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate + UPLOAD_DROP_TEXT: 'Presuňte súbor .bin firmvéru alebo kliknite sem', ERROR: 'Neočakávaná chyba, prosím skúste to znova', TIME_SET: 'Nastavený čas', MANAGE_USERS: 'Správa používateľov', @@ -340,8 +340,8 @@ const sk: Translation = { AUTO_SCROLL: 'Automatické rolovanie', DASHBOARD: 'Panel', DEVELOPER_MODE: 'Režim vývojára', - BYTES: 'Bytes', // TODO translate - BITMASK: 'Bit Mask',// TODO translate + BYTES: 'Bytov', + BITMASK: 'Bitová maska', DUPLICATE: 'Duplicitné', UPGRADE: 'Inovovať', DASHBOARD_1: 'Všetky entity EMS, ktoré sú aktívne a označené ako obľúbené, plus všetky vlastné entity, plány a údaje externých senzorov sú zobrazené nižšie.', From 0c7301a020365736cd5aeb3ff4f4e65bfd3ea4dc Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 14:00:20 +0100 Subject: [PATCH 2/7] TYPE has param --- interface/src/app/settings/ApplicationSettings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx index 7cda3cb2b..3359ae477 100644 --- a/interface/src/app/settings/ApplicationSettings.tsx +++ b/interface/src/app/settings/ApplicationSettings.tsx @@ -554,7 +554,7 @@ const ApplicationSettings = () => { Date: Sun, 23 Mar 2025 14:00:35 +0100 Subject: [PATCH 3/7] add led_type to comment --- src/core/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index e51e8c4d6..441d3ee6f 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1821,7 +1821,7 @@ bool System::command_test(const char * value, const int8_t id) { // takes a board profile and populates a data array with GPIO configurations // returns false if profile is unknown // -// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode +// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode, led_type // // clock modes: // 0 = RMII clock input to GPIO0 From e5e9d4c71359b4a6d14e382a1e83a1570923fd8e Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 14:00:46 +0100 Subject: [PATCH 4/7] fix test data with led_type --- mock-api/rest_server.ts | 42 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index 55e65d15f..a09430301 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -58,6 +58,7 @@ let settings = { eth_power: 15, eth_phy_addr: 0, eth_clock_mode: 1, + led_type: 0, platform: 'ESP32', modbus_enabled: false, modbus_port: 502, @@ -175,7 +176,7 @@ switch (emulate_esp as string) { settings.platform = 'ESP32'; break; - // ESP32S3 + // ESP32 S3 case 'ESP32S3': default: system_status.esp_platform = 'ESP32S3'; @@ -185,7 +186,7 @@ switch (emulate_esp as string) { system_status.psram = true; system_status.psram_size = 8189; system_status.free_psram = 8166; - settings.board_profile = 'S3'; + settings.board_profile = 'S32S3'; settings.platform = 'ESP32S3'; break; } @@ -4864,7 +4865,8 @@ router phy_type: settings.phy_type, eth_power: settings.eth_power, eth_phy_addr: settings.eth_phy_addr, - eth_clock_mode: settings.eth_clock_mode + eth_clock_mode: settings.eth_clock_mode, + led_type: settings.led_type }; if (board_profile == 'S32') { @@ -4878,6 +4880,19 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; + } else if (board_profile == 'S32S3') { + // BBQKees Gateway S3 + data.led_gpio = 2; + data.dallas_gpio = 18; + data.rx_gpio = 5; + data.tx_gpio = 17; + data.pbutton_gpio = 0; + data.phy_type = 0; + data.eth_power = 0; + data.eth_phy_addr = 0; + data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'E32') { // BBQKees Gateway E32 data.led_gpio = 2; @@ -4889,6 +4904,19 @@ router data.eth_power = 16; data.eth_phy_addr = 1; data.eth_clock_mode = 0; + data.led_type = 0; + } else if (board_profile == 'E32V2') { + // BBQKees Gateway E32 V2 + data.led_gpio = 2; + data.dallas_gpio = 14; + data.rx_gpio = 4; + data.tx_gpio = 5; + data.pbutton_gpio = 34; + data.phy_type = 1; + data.eth_power = 15; + data.eth_phy_addr = 0; + data.eth_clock_mode = 1; + data.led_type = 0; } else if (board_profile == 'MH-ET') { // MH-ET Live D1 Mini data.led_gpio = 2; @@ -4900,6 +4928,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'NODEMCU') { // NodeMCU 32S data.led_gpio = 2; @@ -4911,6 +4940,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'LOLIN') { // Lolin D32 data.led_gpio = 2; @@ -4922,6 +4952,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'OLIMEX') { // Olimex ESP32-EVB (uses U1TXD/U1RXD/BUTTON, no LED or Dallas) data.led_gpio = 0; @@ -4933,6 +4964,7 @@ router data.eth_power = -1; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'OLIMEXPOE') { // Olimex ESP32-POE data.led_gpio = 0; @@ -4944,6 +4976,7 @@ router data.eth_power = 12; data.eth_phy_addr = 0; data.eth_clock_mode = 3; + data.led_type = 0; } else if (board_profile == 'C3MINI') { // Lolin C3 mini data.led_gpio = 7; @@ -4955,6 +4988,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'S2MINI') { // Lolin C3 mini data.led_gpio = 15; @@ -4966,6 +5000,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } else if (board_profile == 'S3MINI') { // Liligo S3 mini data.led_gpio = 17; @@ -4977,6 +5012,7 @@ router data.eth_power = 0; data.eth_phy_addr = 0; data.eth_clock_mode = 0; + data.led_type = 0; } data.board_profile = From ad8f2dc82385760bc462289f0042e910affa9951 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 15:43:07 +0100 Subject: [PATCH 5/7] add --- .github/workflows/stale_issues.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/stale_issues.yml diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml new file mode 100644 index 000000000..3aa54e47b --- /dev/null +++ b/.github/workflows/stale_issues.yml @@ -0,0 +1,24 @@ +name: "Mark or close stale issues and PRs" + +on: + schedule: + - cron: "30 * * * *" + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v9 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 25 + days-before-close: 5 + stale-issue-message: "This issue has been automatically marked as stale because it hasn't any activity in last few weeks. It will be closed if no further activity occurs. Thank you for your contributions." + stale-pr-message: "This PR has been automatically marked as stale because it hasn't any activity in last few weeks. It will be closed if no further activity occurs. Thank you for your contributions." + close-issue-message: "This issue was automatically closed because of being stale. Feel free to open a new one if you still experience this problem." + close-pr-message: "This PR was automatically closed because of being stale." + stale-pr-label: "stale" + stale-issue-label: "stale" + exempt-issue-labels: "bug,enhancement,pinned,security" + exempt-pr-labels: "bug,enhancement,pinned,security" + \ No newline at end of file From d42efb32aba109ef5f4dc747d6e46648036ed3fc Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 15:45:53 +0100 Subject: [PATCH 6/7] clean-up --- interface/yarn.lock | 6 +++--- mock-api/rest_server.ts | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/interface/yarn.lock b/interface/yarn.lock index e29cf72d8..04f3c0cc0 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -2039,9 +2039,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001688": - version: 1.0.30001706 - resolution: "caniuse-lite@npm:1.0.30001706" - checksum: 10c0/b502d0a509611fd5b009e1123d482e983696984b6b749c3f485fd8d02cc58376c59cf0bb15f22fa2d337da104970edd27dd525d4663cebc728e26ac4adedff0d + version: 1.0.30001707 + resolution: "caniuse-lite@npm:1.0.30001707" + checksum: 10c0/a1beaf84bad4f6617bbc5616d6bc0c9cab73e73f7e9e09b6466af5195b1bc393e0f6f19643d7a1c88bd3f4bfa122d7bea81cf6225ec3ade57d5b1dd3478c1a1b languageName: node linkType: hard diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index a09430301..58d50f4e2 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -270,10 +270,10 @@ function updateMask(entity: any, de: any, dd: any) { const old_custom_name = dd.nodes[dd_objIndex].cn; console.log( 'comparing names, old (' + - old_custom_name + - ') with new (' + - new_custom_name + - ')' + old_custom_name + + ') with new (' + + new_custom_name + + ')' ); if (old_custom_name !== new_custom_name) { changed = true; @@ -368,15 +368,15 @@ function check_upgrade(version: string) { const stable_version = version.split(',')[1]; console.log( 'latest dev version: ' + - dev_version + - ', latest stable version: ' + - stable_version + dev_version + + ', latest stable version: ' + + stable_version ); console.log( 'Version upgrade check from version ' + - THIS_VERSION + - ', upgradable: ' + - VERSION_IS_UPGRADEABLE + THIS_VERSION + + ', upgradable: ' + + VERSION_IS_UPGRADEABLE ); data = { emsesp_version: THIS_VERSION, From fa3d42a1c7650b9473bfb1790a3ff4b89ae2f04b Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 23 Mar 2025 16:55:57 +0100 Subject: [PATCH 7/7] rename github actions --- .github/workflows/github-releases-to-discord.yml | 2 +- .github/workflows/pr_check.yml | 2 +- .github/workflows/pre_release.yml | 2 +- .github/workflows/stale_issues.yml | 9 ++++----- .github/workflows/tagged_release.yml | 2 +- .github/workflows/test_release.yml | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/github-releases-to-discord.yml b/.github/workflows/github-releases-to-discord.yml index 140d6a63e..6371161a6 100644 --- a/.github/workflows/github-releases-to-discord.yml +++ b/.github/workflows/github-releases-to-discord.yml @@ -1,4 +1,4 @@ -name: 'github-releases-to-discord' +name: 'Publish releases to discord' on: release: diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index 003969d14..789795aa3 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -1,4 +1,4 @@ -name: 'pr_check' +name: 'Pre-check on PR' on: workflow_dispatch: diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index f5884632b..60fc037ac 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/pre_release.yml @@ -1,4 +1,4 @@ -name: 'pre-release' +name: 'Build dev release' on: workflow_dispatch: diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml index 3aa54e47b..8ff56ea3f 100644 --- a/.github/workflows/stale_issues.yml +++ b/.github/workflows/stale_issues.yml @@ -11,14 +11,13 @@ jobs: - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - days-before-stale: 25 + days-before-stale: 30 days-before-close: 5 - stale-issue-message: "This issue has been automatically marked as stale because it hasn't any activity in last few weeks. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This PR has been automatically marked as stale because it hasn't any activity in last few weeks. It will be closed if no further activity occurs. Thank you for your contributions." - close-issue-message: "This issue was automatically closed because of being stale. Feel free to open a new one if you still experience this problem." + stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment otherwise this will be closed in 5 days." + stale-pr-message: "This PR has been automatically marked as stale because there has been no activity in last 30 days. It will be closed if no further activity occurs. Thank you for your contributions." + close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity." close-pr-message: "This PR was automatically closed because of being stale." stale-pr-label: "stale" stale-issue-label: "stale" exempt-issue-labels: "bug,enhancement,pinned,security" exempt-pr-labels: "bug,enhancement,pinned,security" - \ No newline at end of file diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml index aa5bd46d5..70817cad5 100644 --- a/.github/workflows/tagged_release.yml +++ b/.github/workflows/tagged_release.yml @@ -1,4 +1,4 @@ -name: 'tagged-release' +name: 'Build stable release' on: workflow_dispatch: diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index bfd34f80c..8891d6bc0 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -1,4 +1,4 @@ -name: 'test-release' +name: 'Build test release' on: workflow_dispatch: