esp01: Use arduino-cli in Makefile

raimue · raimue · commit c6e34ff3d4bd · 2021-03-06T19:41:21.000+01:00
diff --git a/src/arduino-cli.mk b/src/arduino-cli.mk
@@ -0,0 +1,47 @@
+## Variables
+
+ARDUINO_CLI ?= arduino-cli
+BUILD_PATH ?= $(PWD)/.build
+
+## Local options
+
+ifneq ($(V),)
+VERBOSE = -v
+else
+VERBOSE =
+endif
+
+## Makefile options
+
+ifeq ($(BOARD_FQDN),)
+$(error missing BOARD_FQDN)
+endif
+
+ifeq ($(SERIAL_PORT),)
+$(error missing SERIAL_PORT)
+endif
+
+## Build rules
+
+.PHONY: all
+all: compile
+
+.PHONY: compile
+compile:
+	$(ARDUINO_CLI) compile $(VERBOSE) -b $(BOARD_FQDN) --build-path $(BUILD_PATH)
+
+.PHONY: upload
+upload:
+	$(ARDUINO_CLI) upload $(VERBOSE) -b $(BOARD_FQDN) -p $(SERIAL_PORT) --input-dir $(BUILD_PATH)
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILD_PATH)
+
+## Aliases
+
+.PHONY: serial
+serial: monitor
+
+.PHONY: flash
+flash: upload
diff --git a/src/esp01-blinky/Makefile b/src/esp01-blinky/Makefile
@@ -1 +1 @@
-include ../arduino-config-esp.mk
+include ../esp01.mk
diff --git a/src/esp01-deepsleep/Makefile b/src/esp01-deepsleep/Makefile
@@ -1,3 +1 @@
-ARDUINO_LIBS =
-MONITOR_BAUDRATE = 74880
-include ../arduino-config-esp.mk
+include ../esp01.mk
diff --git a/src/esp01-deepsleep/esp01-deepsleep.ino b/src/esp01-deepsleep/esp01-deepsleep.ino
diff --git a/src/esp01-dht22/Makefile b/src/esp01-dht22/Makefile
@@ -1,3 +1 @@
-ARDUINO_LIBS = ESP8266WiFi Ticker DHT
-MONITOR_BAUDRATE = 115200
-include ../arduino-config-esp.mk
+include ../esp01.mk
diff --git a/src/esp01-dht22/esp01-dht22.ino b/src/esp01-dht22/esp01-dht22.ino
diff --git a/src/esp01.mk b/src/esp01.mk
@@ -0,0 +1,4 @@
+BOARD_FQDN = esp8266:esp8266:generic:baud=921600
+SERIAL_PORT ?= /dev/ttyUSB1
+
+include ../arduino-cli.mk

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ../arduino-config-esp.mk`
	`1`	`+include ../esp01.mk`