Merge branch 'spuder:main' into rpipicow

agreenbhm · web-flow · commit 7d2cc8cb99f5 · 2025-03-04T08:09:32.000-05:00
diff --git a/.github/workflows/esphome.yaml b/.github/workflows/esphome.yaml
@@ -74,18 +74,20 @@ jobs:
           cat firmware/conf.d/version.yaml
 
       - name: Build OpenSpool-Mini firmware
-        uses: esphome/build-action@v4.0.2
+        uses: esphome/build-action@v6.0.0
         with:
           yaml-file: ${{ github.workspace }}/firmware/lolin_s2_mini.yaml
+          version: 2024.12.4
           release-summary: ${{ env.RELEASE_SUMMARY }}
           release-url: https://openspool.io/firmware
           complete-manifest: false
         if: matrix.target == 'esp32s2'
 
       - name: Build OpenSpool-AMS firmware
-        uses: esphome/build-action@v4.0.2
+        uses: esphome/build-action@v6.0.0
         with:
           yaml-file: ${{ github.workspace }}/firmware/lolin_s3_mini.yaml
+          version: 2024.12.4
           release-summary: ${{ env.RELEASE_SUMMARY }}
           release-url: https://openspool.io/firmware
           complete-manifest: false
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 # OpenSpool
 **Your filament wants to be free**
 
-![](https://img.shields.io/badge/openspool-1.18.0-magenta)
+![](https://img.shields.io/badge/openspool-1.19.1-magenta)
 [![Discord](https://img.shields.io/discord/1298381115706576907?logo=discord)](https://discord.gg/4EaXHu9CEj) [![Reddit](https://img.shields.io/badge/reddit-join-orange?logo=reddit)](https://www.reddit.com/r/openspool)  
 
 ---
diff --git a/docs/firmware/manifest.json b/docs/firmware/manifest.json
@@ -1,13 +1,13 @@
 {
   "name": "OpenSpool",
-  "version": "1.18.0",
+  "version": "1.19.1",
   "builds": [
     {
       "chipFamily": "ESP32-S2",
       "ota": {
         "path": "openspool-esp32s2.ota.bin",
-        "md5": "0617f2d5931811bbb77810a2b794cc72",
-        "summary": "Add PETG HF",
+        "md5": "7fb01acd9baa67eaded2ad43b291416e",
+        "summary": "Pin esphome version",
         "release_url": "https://openspool.io/firmware"
       },
       "parts": [
@@ -21,8 +21,8 @@
       "chipFamily": "ESP32-S3",
       "ota": {
         "path": "openspool-esp32s3.ota.bin",
-        "md5": "f4c66702ce689e97cf06d19ab8598708",
-        "summary": "Add PETG HF",
+        "md5": "ce2e7bda63b8f1dc7147363c7da5bd6f",
+        "summary": "Pin esphome version",
         "release_url": "https://openspool.io/firmware"
       },
       "parts": [
diff --git a/docs/firmware/openspool-esp32s2.factory.bin b/docs/firmware/openspool-esp32s2.factory.bin
diff --git a/docs/firmware/openspool-esp32s2.factory.bin.md5 b/docs/firmware/openspool-esp32s2.factory.bin.md5
@@ -1 +1 @@
-da7abc6cd8c84931da289920727ed40a
+ff62443682a1aa96da63465ece35f693
diff --git a/docs/firmware/openspool-esp32s2.ota.bin b/docs/firmware/openspool-esp32s2.ota.bin
diff --git a/docs/firmware/openspool-esp32s2.ota.bin.md5 b/docs/firmware/openspool-esp32s2.ota.bin.md5
@@ -1 +1 @@
-0617f2d5931811bbb77810a2b794cc72
+7fb01acd9baa67eaded2ad43b291416e
diff --git a/docs/firmware/openspool-esp32s3.factory.bin b/docs/firmware/openspool-esp32s3.factory.bin
diff --git a/docs/firmware/openspool-esp32s3.factory.bin.md5 b/docs/firmware/openspool-esp32s3.factory.bin.md5
@@ -1 +1 @@
-c4314d9845f9fe14b4f367305e21f3fc
+2ddf258822a514fc62d5c0caa3278e96
diff --git a/docs/firmware/openspool-esp32s3.ota.bin b/docs/firmware/openspool-esp32s3.ota.bin
diff --git a/docs/firmware/openspool-esp32s3.ota.bin.md5 b/docs/firmware/openspool-esp32s3.ota.bin.md5
@@ -1 +1 @@
-f4c66702ce689e97cf06d19ab8598708
+ce2e7bda63b8f1dc7147363c7da5bd6f
diff --git a/docs/index.md b/docs/index.md
@@ -6,7 +6,7 @@ nav_order: 1
 
 # 📟 OpenSpool Firmware Installation
 
-![](https://img.shields.io/badge/openspool-1.18.0-magenta)
+![](https://img.shields.io/badge/openspool-1.19.1-magenta)
 
 <div class="install-container">
     <script type="module" src="https://unpkg.com/esp-web-tools@8.0.6/dist/web/install-button.js"></script>
diff --git a/firmware/bambu.h b/firmware/bambu.h
@@ -40,7 +40,7 @@ namespace bambulabs
 
     // Special cases for brand-specific codes
     const std::unordered_map<std::string, std::unordered_map<std::string, std::string>> brand_specific_codes = {
-        {"PLA", {{"Bambu", "GFA00"}, {"PolyTerra", "GFL01"}, {"PolyLite", "GFL00"}}},
+        {"PLA", {{"Bambu", "GFA00"}, {"PolyTerra", "GFL01"}, {"PolyLite", "GFL00"}, {"Sunlu", "SNL02"}}},
         {"PLA Aero", {{"Bambu", "GFG01"}}},
         {"TPU", {{"Bambu", "GFU01"}}},
         {"ABS", {{"Bambu", "GFB00"}, {"PolyLite", "GFB60"}}},
@@ -50,7 +50,7 @@ namespace bambulabs
         {"PET-CF", {{"Bambu", "GFT00"}}},
         {"PETG HF", {{"Bambu", "GFG02"}}},
         {"PETG Translucent", {{"Bambu", "GFG01"}}},
-        {"PETG", {{"Bambu", "GFG00"}, {"PolyLite", "GFG60"}}}};
+        {"PETG", {{"Bambu", "GFG00"}, {"PolyLite", "GFG60"}, {"Sunlu", "SNL08"}}}};
 
     // Function with two parameters
     inline std::string get_bambu_code(const std::string &type, const std::string &brand = "")
diff --git a/firmware/conf.d/filament.yaml b/firmware/conf.d/filament.yaml
@@ -81,6 +81,7 @@ select:
   - Overture
   - PolyTerra
   - PolyLite
+  - Sunlu
   on_value:
     then:
     - script.execute: generate_filament_brand_code
@@ -184,29 +185,29 @@ select:
           }
     - script.execute: preview_rfid_data
 switch:
-  - platform: template
-    name: "Include alpha value in filament color"
-    id: filament_include_alpha
-    state_topic:
-    icon: "mdi:palette-outline"
-    optimistic: true
-    web_server:
-      sorting_group_id: sorting_group_filament_settings
-      sorting_weight: 70
-    turn_on_action:
-      then:
-      - lambda: |-
-          id(filament_include_alpha).publish_state(true);
-          char hexStr[3];
-          sprintf(hexStr, "%02X", (int)id(filament_alpha_int).state);     
-          id(filament_alpha).publish_state(hexStr);
-      - script.execute: preview_rfid_data
-    turn_off_action:
-      then:
-      - lambda: |-
-          id(filament_include_alpha).publish_state(false);
-          id(filament_alpha).publish_state("");
-      - script.execute: preview_rfid_data  
+- platform: template
+  name: "Include alpha value in filament color"
+  id: filament_include_alpha
+  state_topic:
+  icon: "mdi:palette-outline"
+  optimistic: true
+  web_server:
+    sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 70
+  turn_on_action:
+    then:
+    - lambda: |-
+        id(filament_include_alpha).publish_state(true);
+        char hexStr[3];
+        sprintf(hexStr, "%02X", (int)id(filament_alpha_int).state);     
+        id(filament_alpha).publish_state(hexStr);
+    - script.execute: preview_rfid_data
+  turn_off_action:
+    then:
+    - lambda: |-
+        id(filament_include_alpha).publish_state(false);
+        id(filament_alpha).publish_state("");
+    - script.execute: preview_rfid_data
 number:
 - platform: template
   name: "Filament Min Temp"
diff --git a/firmware/conf.d/version.yaml b/firmware/conf.d/version.yaml
@@ -1,4 +1,4 @@
 ---
 # Do not modify, github actions will update the number on each new release
 substitutions:
-  version: "1.18.0"
+  version: "1.19.1"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-da7abc6cd8c84931da289920727ed40a`
	`1`	`+ff62443682a1aa96da63465ece35f693`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0617f2d5931811bbb77810a2b794cc72`
	`1`	`+7fb01acd9baa67eaded2ad43b291416e`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c4314d9845f9fe14b4f367305e21f3fc`
	`1`	`+2ddf258822a514fc62d5c0caa3278e96`