Merge branch 'master' of ssh://gitea.communiquons.org:52001/pierre/SolarEnergy

Publish version 1.0.2 of ESP32 firmware
Add a PIN to the card
2024-12-24 15:30:52 +01:00 · 2024-12-24 17:30:17 +01:00 · 2024-12-24 17:22:37 +01:00 · 2024-12-20 00:24:32 +00:00 · 2024-12-19 00:24:17 +00:00 · 2024-12-18 00:06:47 +00:00
5 changed files with 41 additions and 36 deletions
--- a/central_backend/Cargo.lock
+++ b/central_backend/Cargo.lock
@@ -723,7 +723,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_yml",
- "thiserror 2.0.7",
+ "thiserror 2.0.8",
 "tokio",
 "tokio_schedule",
 "uuid",
@@ -1702,9 +1702,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
 name = "libredox"
@@ -2633,11 +2633,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.7"
+version = "2.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767"
+checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a"
 dependencies = [
- "thiserror-impl 2.0.7",
+ "thiserror-impl 2.0.8",
 ]

 [[package]]
@@ -2653,9 +2653,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.7"
+version = "2.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36"
+checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3247,7 +3247,7 @@ dependencies = [
 "pbkdf2",
 "rand",
 "sha1",
- "thiserror 2.0.7",
+ "thiserror 2.0.8",
 "time",
 "zeroize",
 "zopfli",
--- a/central_frontend/package-lock.json
+++ b/central_frontend/package-lock.json
@@ -2098,16 +2098,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",
-      "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
+      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
      "dev": true,
-      "license": "MITClause",
+      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.0",
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/typescript-estree": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -2123,14 +2123,14 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",
-      "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
+      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0"
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2141,9 +2141,9 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
-      "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2155,14 +2155,14 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",
-      "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
+      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
        "is-glob": "^4.0.3",
@@ -2182,13 +2182,13 @@
      }
    },
    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",
-      "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
+      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
+        "@typescript-eslint/types": "8.18.1",
        "eslint-visitor-keys": "^4.2.0"
      },
      "engines": {
--- a/esp32_device/README.md
+++ b/esp32_device/README.md
@@ -2,6 +2,11 @@

 ESP32 client device, using `W32-ETH01` device

+## Pins for relays
+The pins are the following (in the order of definition): 4, 14, 15, 2
+
+**WARNING!** The Pin 2 MUST be disconnect to reflash the card!
+
 ## Some commands

 Create a new firmware build:
--- a/esp32_device/main/relays.c
+++ b/esp32_device/main/relays.c
@@ -9,7 +9,7 @@ static const char *TAG = "relays";
 /**
 * Device relays GPIO ids
 */
-static int DEVICE_GPIO_IDS[3] = {4, 14, 15};
+static int DEVICE_GPIO_IDS[4] = {4, 14, 15, 2};

 int relays_count()
 {
--- a/esp32_device/version.txt
+++ b/esp32_device/version.txt
@@ -1 +1 @@
-1.0.2-b1
+1.0.2
Author	SHA1	Message	Date
Pierre HUBERT	4309a19f24	Merge branch 'master' of ssh://gitea.communiquons.org:52001/pierre/SolarEnergy All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2024-12-24 15:30:52 +01:00
Pierre HUBERT	67a0436d02	Publish version 1.0.2 of ESP32 firmware	2024-12-24 17:30:17 +01:00
Pierre HUBERT	5ff169d8c2	Add a PIN to the card	2024-12-24 17:22:37 +01:00
Pierre HUBERT	166ac5c8c2	Update Rust crate libc to v0.2.169 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2024-12-20 00:24:32 +00:00
Pierre HUBERT	0b53037140	Update Rust crate thiserror to v2.0.8 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2024-12-19 00:24:17 +00:00
Pierre HUBERT	901f6b0e6f	Update dependency @typescript-eslint/parser to v8.18.1 All checks were successful continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	2024-12-18 00:06:47 +00:00
@@ -1 +1 @@
 .0.2-b1
 .0.2