flip logic of build for pipeline

Author: spuder

firmware/Makefile

@@ -17,22 +17,25 @@ clean:
 build:
 	esphome config config.yaml
 	esphome compile config.yaml
-build-pcb:
+build-breadboard:
 	esphome \
-		-s name openspool \
-		-s rfid1_miso_pin "GPIO37" \
+		-s rfid1_miso_pin "GPIO39" \
 		-s rfid1_clk_pin "GPIO36" \
 		-s rfid1_mosi_pin "GPIO35" \
-		-s rfid1_ss_pin "GPIO34" \
-		-s rfid1_spi_interface "spi2" \
+		-s rfid1_ss_pin "GPIO33" \
+		-s rfid1_spi_interface "any" \
 		config config.yaml
 	esphome \
-		-s name openspool \
-		-s rfid1_miso_pin "GPIO37" \
+		-s rfid1_miso_pin "GPIO39" \
 		-s rfid1_clk_pin "GPIO36" \
 		-s rfid1_mosi_pin "GPIO35" \
-		-s rfid1_ss_pin "GPIO34" \
-		-s rfid1_spi_interface "spi2" \
+		-s rfid1_ss_pin "GPIO33" \
+		-s rfid1_spi_interface "any" \
+		compile config.yaml
+build-pcb:
+	esphome \
+		config config.yaml
+	esphome \
 		compile config.yaml
 upload:
 	@echo "Uploading to $(USB_ADDRESS)"
@@ -49,21 +52,18 @@ run-usb-breadboard:
 	# you can then run the run-ota command which will preserve the wifi settings
 	# this is a workaround until eshome supports improv_serial on esp32s2
 	esphome \
-		-s name openspool \
+		-s rfid1_miso_pin "GPIO39" \
+		-s rfid1_clk_pin "GPIO36" \
+		-s rfid1_mosi_pin "GPIO35" \
+		-s rfid1_ss_pin "GPIO33" \
+		-s rfid1_spi_interface "any" \
 		run config.yaml --device $(USB_ADDRESS)
 	# podman run -v $PWD:/data -it ghcr.io/esphome/esphome:dev compile /data/config.yaml
 	# podman run -v $PWD:/data --device=$(USB_ADDRESS) -it ghcr.io/esphome/esphome:dev run /data/config.yaml --device $(USB_ADDRESS)
 run-usb-pcb:
 	esphome \
-		-s name openspool \
-		-s rfid1_miso_pin "GPIO37" \
-		-s rfid1_clk_pin "GPIO36" \
-		-s rfid1_mosi_pin "GPIO35" \
-		-s rfid1_ss_pin "GPIO34" \
-		-s rfid1_spi_interface "spi2" \
 		run config.yaml --device $(USB_ADDRESS)
 run-ota:
 	# run-ota is used for subsequent uploads after the device has been joined to the wifi network
 	esphome \
-		-s name openspool \
 		run config.yaml

firmware/config.yaml

@@ -1,10 +1,10 @@
 substitutions:
   name: openspool
-  rfid1_spi_interface: "any" #spi2 on PCB
-  rfid1_clk_pin: "GPIO39" #36 on PCB
+  rfid1_spi_interface: "spi" #any on Breadboard
+  rfid1_clk_pin: "GPIO36" #39 on Breadboard version
   rfid1_miso_pin: "GPIO37"
   rfid1_mosi_pin: "GPIO35"
-  rfid1_ss_pin: "GPIO33" #34 on PCB
+  rfid1_ss_pin: "GPIO34" #33 on Breadboard version
 
 esphome:
   name: ${name} #Don't use underscore '_' in name https://esphome.io/guides/faq.html#why-shouldn-t-i-use-underscores-in-my-device-name