Merge pull request #1439 from proddy/dev

prepare another 3.6.3 build with board profile fixed
2025-12-08 00:39:50 +03:00 · 2023-11-19 21:19:10 +01:00
parent 905b52e39d dfd9fe4d01
commit 2de855e044
5 changed files with 66 additions and 71 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -29,7 +29,7 @@
    "@table-library/react-table-library": "4.1.7",
    "@types/imagemin": "^8.0.4",
    "@types/lodash-es": "^4.17.11",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.9.2",
    "@types/react": "^18.2.37",
    "@types/react-dom": "^18.2.15",
    "@types/react-router-dom": "^5.3.3",
--- a/interface/vite.config.ts
+++ b/interface/vite.config.ts
@@ -5,7 +5,6 @@ import viteImagemin from 'vite-plugin-imagemin';
 import { visualizer } from 'rollup-plugin-visualizer';

 export default defineConfig(({ command, mode }) => {
-  // standalone build for development - runs the server
  if (command === 'serve') {
    console.log('Preparing for standalone build with server, mode=' + mode);
    return {
@@ -30,9 +29,17 @@ export default defineConfig(({ command, mode }) => {
    };
  }

+  if (command === 'build' && mode === 'hosted') {
+    return {
+      plugins: [preact(), viteTsconfigPaths()],
+      build: {
+        chunkSizeWarningLimit: 1024
+      }
+    };
+  }
+
  // production build, both for hosted and building the firmware
  if (command === 'build') {
-    console.log('Preparing for production build, mode is ' + mode);
    return {
      plugins: [
        preact(),
@@ -79,11 +86,7 @@ export default defineConfig(({ command, mode }) => {

      build: {
        // target: 'es2022',
-        outDir: 'dist',
-        reportCompressedSize: false,
        chunkSizeWarningLimit: 1024,
-        sourcemap: false,
-        manifest: false,
        minify: 'terser',
        terserOptions: {
          compress: {
@@ -109,16 +112,6 @@ export default defineConfig(({ command, mode }) => {
          nameCache: null,
          safari10: false,
          toplevel: false
-        },
-
-        rollupOptions: {
-          // Ignore "use client" waning since we are not using SSR
-          onwarn(warning, warn) {
-            if (warning.code === 'MODULE_LEVEL_DIRECTIVE' && warning.message.includes(`"use client"`)) {
-              return;
-            }
-            warn(warning);
-          }
        }
      }
    };
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1478,12 +1478,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/node@npm:^20.9.1":
-  version: 20.9.1
-  resolution: "@types/node@npm:20.9.1"
+"@types/node@npm:^20.9.2":
+  version: 20.9.2
+  resolution: "@types/node@npm:20.9.2"
  dependencies:
    undici-types: "npm:~5.26.4"
-  checksum: b2b3f9ee31db63ccd3d48e5597d359c3385879679f37a749e473b47068aae181d0e280f39f153d75ce704640b3ec09d029aecd2a686e5658fb866254dc7e781b
+  checksum: 8bab2870bfc02efc988c53dfb0149634f8feb824132cc7f20b36f3d55d89ef893e3a43d545524a5cb3a284f4ce68ae4181d75a4a39cee6b79c586d719e6b7461
  languageName: node
  linkType: hard

@@ -1745,7 +1745,7 @@ __metadata:
    "@table-library/react-table-library": "npm:4.1.7"
    "@types/imagemin": "npm:^8.0.4"
    "@types/lodash-es": "npm:^4.17.11"
-    "@types/node": "npm:^20.9.1"
+    "@types/node": "npm:^20.9.2"
    "@types/react": "npm:^18.2.37"
    "@types/react-dom": "npm:^18.2.15"
    "@types/react-router-dom": "npm:^5.3.3"
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -353,6 +353,54 @@ const EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'resetCustomiz
 const EMSESP_WRITE_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'schedule';
 const EMSESP_WRITE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'entities';

+const emsesp_info = {
+  System: {
+    version: '3.6.3',
+    uptime: '001+06:40:34.018',
+    'uptime (seconds)': 110434,
+    freemem: 131,
+    'reset reason': 'Software reset CPU / Software reset CPU',
+    'Sensor sensors': 3
+  },
+  Network: {
+    connection: 'Ethernet',
+    hostname: 'ems-esp',
+    MAC: 'A8:03:2A:62:64:CF',
+    'IPv4 address': '192.168.1.134/255.255.255.0',
+    'IPv4 gateway': '192.168.1.1',
+    'IPv4 nameserver': '192.168.1.1'
+  },
+  Status: {
+    'bus status': 'connected',
+    'bus protocol': 'Buderus',
+    'telegrams received': 84986,
+    'read requests sent': 14748,
+    'write requests sent': 3,
+    'incomplete telegrams': 8,
+    'tx fails': 0,
+    'rx line quality': 100,
+    'tx line quality': 100,
+    MQTT: 'connected',
+    'MQTT publishes': 46336,
+    'MQTT publish fails': 0,
+    'Sensor reads': 22086,
+    'Sensor fails': 0
+  },
+  Devices: [
+    {
+      type: 'Boiler',
+      name: 'Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i (DeviceID:0x08 ProductID:123, Version:06.01)',
+      handlers:
+        '0x10 0x11 0xC2 0x14 0x15 0x1C 0x18 0x19 0x1A 0x35 0x16 0x33 0x34 0x26 0x2A 0xD1 0xE3 0xE4 0xE5 0xE6 0xE9 0xEA'
+    },
+    {
+      type: 'Thermostat',
+      name: 'RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)',
+      handlers: '0xA3 0x06 0xA2 0x12 0x91 0xA8'
+    }
+  ]
+};
+
 settings = {
  locale: 'en',
  tx_mode: 4,
@@ -2638,53 +2686,6 @@ rest_server.get(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => {
 });

 // EMS-ESP API specific
-const emsesp_info = {
-  System: {
-    version: '3.6.3',
-    uptime: '001+06:40:34.018',
-    'uptime (seconds)': 110434,
-    freemem: 131,
-    'reset reason': 'Software reset CPU / Software reset CPU',
-    'Sensor sensors': 3
-  },
-  Network: {
-    connection: 'Ethernet',
-    hostname: 'ems-esp',
-    MAC: 'A8:03:2A:62:64:CF',
-    'IPv4 address': '192.168.1.134/255.255.255.0',
-    'IPv4 gateway': '192.168.1.1',
-    'IPv4 nameserver': '192.168.1.1'
-  },
-  Status: {
-    'bus status': 'connected',
-    'bus protocol': 'Buderus',
-    'telegrams received': 84986,
-    'read requests sent': 14748,
-    'write requests sent': 3,
-    'incomplete telegrams': 8,
-    'tx fails': 0,
-    'rx line quality': 100,
-    'tx line quality': 100,
-    MQTT: 'connected',
-    'MQTT publishes': 46336,
-    'MQTT publish fails': 0,
-    'Sensor reads': 22086,
-    'Sensor fails': 0
-  },
-  Devices: [
-    {
-      type: 'Boiler',
-      name: 'Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i (DeviceID:0x08 ProductID:123, Version:06.01)',
-      handlers:
-        '0x10 0x11 0xC2 0x14 0x15 0x1C 0x18 0x19 0x1A 0x35 0x16 0x33 0x34 0x26 0x2A 0xD1 0xE3 0xE4 0xE5 0xE6 0xE9 0xEA'
-    },
-    {
-      type: 'Thermostat',
-      name: 'RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)',
-      handlers: '0xA3 0x06 0xA2 0x12 0x91 0xA8'
-    }
-  ]
-};

 rest_server.post(API_ENDPOINT_ROOT, (req, res) => {
  console.log('Generic API POST');
--- a/platformio.ini
+++ b/platformio.ini
@@ -83,8 +83,8 @@ extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
 board_build.extra_flags = -DBOARD_HAS_PSRAM
-build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
+build_flags = ${common.build_flags}

 [env:ci_s3]
 extends = espressi32_base
@@ -93,10 +93,11 @@ board = lolin_s3
 board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
+build_unflags = ${common.unbuild_flags}
 build_flags =
  ${common.build_flags}
  -O2
-build_unflags = ${common.unbuild_flags}
+  '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'

 [env:esp32_4M]
 extends = espressi32_base_tasmota