Fix s2

firmware/Makefile

@@ -8,10 +8,10 @@ USB_ADDRESS ?= $(error USB_ADDRESS is not set)
 all: build upload dashboard logs
 
 # Preserve backwards compatabliity in documentation
-run-usb: run-usb-breadboard-mini
-run-usb-pcb: run-usb-pcb-mini
-build-pcb-mini: build-esp32s2-mini
-build-pcb-ams: build-esp32s2-ams
+# run-usb: run-usb-breadboard-mini
+# run-usb-pcb: run-usb-pcb-mini
+# build-pcb-mini: build-esp32s2-mini
+# build-pcb-ams: build-esp32s2-ams
 
 clean:
 	esphome clean lolin_s2_mini.yaml
@@ -61,10 +61,10 @@ dashboard:
 # 		-s rfid0_ss_pin "GPIO33" \
 # 		-s spi2_type "any" \
 # 		run openspool-mini.yaml --device $(USB_ADDRESS)
-run-usb-pcb-mini:
+lolin_s2_mini:
 	esphome \
 		run lolin_s2_mini.yaml --device $(USB_ADDRESS)
-run-usb-pcb-ams:
+lolin_s3_mini:
 	esphome \
 		run lolin_s3_mini.yaml --device $(USB_ADDRESS)
 devkit:

firmware/lolin_s2_mini.yaml

@@ -22,14 +22,13 @@ wifi:
 packages: 
   openspool-mini: !include openspool-mini.yaml
   improv-serial: !include conf.d/improv-serial.yaml
-  improv-bluetooth: !include conf.d/improv-bluetooth.yaml
 
 # The s2 is pushing the limits of its cpu,
 # Especially the fake clones without PSRAM
 # Remove components to improve performance
-sensor: 
-  - id: !remove loop_time
-  - id: !remove openspool_wifi_signal
-  - id: !remove openspool_ssid
-  - id: !remove openspool_ip_address
-  - id: !remove free_psram
+# sensor: 
+#   - id: !remove loop_time
+#   - id: !remove openspool_wifi_signal
+#   - id: !remove openspool_ssid
+#   - id: !remove openspool_ip_address
+#   - id: !remove free_psram

firmware/lolin_s3_mini.yaml

@@ -16,3 +16,4 @@ substitutions:
 packages: 
   openspool-mini: !include openspool-mini.yaml
   led-internal: !include conf.d/led-internal.yaml
+  improv-bluetooth: !include conf.d/improv-bluetooth.yaml

firmware/openspool-mini.yaml

@@ -1,9 +1,6 @@
 
 packages:
   base: !include common.yaml
-  status_led: !include conf.d/status_led.yaml
-  button: !include conf.d/button.yaml
-  improv-serial: !include conf.d/improv-serial.yaml
 
 api: 
   reboot_timeout: 0s #reboot_timeout must be 0 if api and mqtt are defined