Merge pull request #33 from raihei/main

spuder · Jan 16, 2025 · 607e267 · 607e267
2 parents fe7b71c + 1d58eb4
commit 607e267
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/firmware/conf.d/pn532_rfid-ams.yaml b/firmware/conf.d/pn532_rfid-ams.yaml
@@ -1,6 +1,6 @@
 pn532_spi:
 - id: rfid_reader_spi_1
-  cs_pin: ${rfid1_clk_pin}
+  cs_pin: ${rfid1_ss_pin}
   spi_id: ${rfid1_spi_interface}
   data_rate: ${spi_data_rate}
   update_interval: ${update_interval}
@@ -76,7 +76,7 @@ pn532_spi:
             payload: !lambda "return bambulabs::generate_mqtt_payload( id(filament_raw_data1).state, 0, 0 );"
 
 - id: rfid_reader_spi_2
-  cs_pin: ${rfid2_clk_pin}
+  cs_pin: ${rfid2_ss_pin}
   spi_id: ${rfid2_spi_interface}
   data_rate: ${spi_data_rate}
   update_interval: ${update_interval}

diff --git a/firmware/esp32-s3-devkitc-1.yaml b/firmware/esp32-s3-devkitc-1.yaml
@@ -14,39 +14,39 @@ substitutions:
   rfid0_ss_pin: GPIO04
 
   rfid1_spi_interface: SPI2
-  rfid1_clk_pin: GPIO05
+  rfid1_ss_pin: GPIO05
 
   rfid2_spi_interface: SPI2
-  rfid2_clk_pin: GPIO06
+  rfid2_ss_pin: GPIO06
 
   rfid3_spi_interface: SPI2
-  rfid3_clk_pin: GPIO07
+  rfid3_ss_pin: GPIO07
 
   # rfid4_spi_interface: SPI2
-  # rfid4_clk_pin: GPIO05
+  # rfid4_ss_pin: GPIO05
 
   # rfid5_spi_interface: SPI2
-  # rfid5_clk_pin: GPIO04
+  # rfid5_ss_pin: GPIO04
 
   # spi3_type: SPI3
   # spi3_clk_pin: GPIO18
   # spi3_miso_pin: GPIO17
   # spi3_mosi_pin: GPIO16
 
   # rfid6_spi_interface: SPI3
-  # rfid6_clk_pin: GPIO15
+  # rfid6_ss_pin: GPIO15
 
   # rfid7_spi_interface: SPI3
-  # rfid7_clk_pin: GPIO9
+  # rfid7_ss_pin: GPIO9
 
   # rfid8_spi_interface: SPI3
-  # rfid8_clk_pin: GPI14 # TODO: Verify this is compatible
+  # rfid8_ss_pin: GPI14 # TODO: Verify this is compatible
 
 packages: 
   openspool-ams: !include openspool-ams.yaml
   improv-serial: !include conf.d/improv-serial.yaml
   #improv-bluetooth: !include conf.d/improv-bluetooth.yaml
-  led-internal: !include conf.d/led-internal.yaml
+  #led-internal: !include conf.d/led-internal.yaml
   extra: !include conf.d/extra.yaml
 
 dashboard_import:

diff --git a/firmware/lolin_s2_mini.yaml b/firmware/lolin_s2_mini.yaml
@@ -11,9 +11,9 @@ substitutions:
   rfid0_spi_interface: SPI2
   rfid0_ss_pin: GPIO34
   #rfid1_spi_interface: SPI2
-  #rfid1_clk_pin: GPIO21
+  #rfid1_ss_pin: GPIO21
   ## rfid1_spi_interface: SPI2
-  ## rfid1_clk_pin: GPIO08
+  ## rfid1_ss_pin: GPIO08
 
 # D1 Mini S2 Boards will reboot when doing tasks like writing to PN532 unless wifi power is reduced
 wifi:

diff --git a/firmware/lolin_s3_mini.yaml b/firmware/lolin_s3_mini.yaml
@@ -15,7 +15,7 @@ substitutions:
 
 packages: 
   openspool-mini: !include openspool-mini.yaml
-  led-internal: !include conf.d/led-internal.yaml
+  #led-internal: !include conf.d/led-internal.yaml
   #improv-bluetooth: !include conf.d/improv-bluetooth.yaml
   extra: !include conf.d/extra.yaml
   button: !include conf.d/button.yaml