andy cleanup

6 files changed, 12 insertions, 10 deletions

diff --git a/src/main/CCS811.cpp b/CCS811.cpp
index 05b71c0..05b71c0 100644
--- a/src/main/CCS811.cpp
+++ b/CCS811.cpp
diff --git a/src/main/CCS811.h b/CCS811.h
index 2640535..2640535 100644
--- a/src/main/CCS811.h
+++ b/CCS811.h
diff --git a/src/main/Makefile b/Makefile
index 2000b24..481382a 100644
--- a/src/main/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@
 #               /dev/ttyACM0   if it exists, or
 #               unknown
 #
-#   IOT_NAME    Name of the IOT device; if not set in the environment
+#   MDNS_NAME   Hostname of the Arduino; if not set in the environment
 #               it will be assigned a value in this makefile. This is
-#               very useful for OTA update, the device will be searched
+#               needed for OTA update, the device will be searched
 #               on the local subnet using this name
 #
 #   OTA_PORT    Port used by OTA update; if not set in the environment
@@ -21,8 +21,10 @@
 #   OTA_PASS    Password used for OTA update; if not set in the environment
 #               it will be assigned the default value of an empty string
 
+PROGNAME = mush
+
 FQBN      =  esp8266:esp8266:espmxdevkit
-IOT_NAME  =  mush
+MDNS_NAME =  $(PROGNAME)
 OTA_PORT  =  8266
 OTA_PASS  =
 
@@ -32,10 +34,10 @@ cli = arduino-cli -b "$(FQBN)"
 
 BUILD_DIR != $(cli) compile --show-properties | sed -ne 's/^build.path=//p'
 
-SRC        := main.ino
-HDRS       := $(wildcard *.h)
-BIN        := $(BUILD_DIR)/main.ino.bin
-ELF        := $(BUILD_DIR)/main.ino.elf
+SRC        := CCS811.cpp $(PROGNAME).ino
+HDRS       := CCS811.h ota.h wifiinfo.h
+BIN        := $(BUILD_DIR)/$(PROGNAME).ino.bin
+ELF        := $(BUILD_DIR)/$(PROGNAME).ino.elf
 
 all: $(ELF)
 .PHONY: all
@@ -44,15 +46,15 @@ compile: $(ELF)
 .PHONY: compile
 
 $(BIN) $(ELF): $(SRC) $(HDRS)
-        $(cli) compile
+        $(cli) compile --warnings all
 
 upload:
         $(cli) upload -p "$(SERIAL_DEV)"
 
 PLAT_PATH != $(cli) compile --show-properties | sed -ne 's/^runtime.platform.path=//p'
 PY_PATH != $(cli) compile --show-properties | sed -ne 's/^runtime.tools.python3.path=//p'
-IOT_IP != getent ahostsv4 mush.local | (read ip _; echo $$ip)
+MDNS_IP != getent ahostsv4 $(MDNS_NAME).local | (read ip _; echo $$ip)
 
 ota: $(BIN)
-        "$(PY_PATH)/python3" "$(PLAT_PATH)/tools/espota.py" -i "$(IOT_IP)" -p "$(OTA_PORT)" --auth="$(OTA_PASS)" -f "$(BIN)"
+        "$(PY_PATH)/python3" "$(PLAT_PATH)/tools/espota.py" -i "$(MDNS_IP)" -p "$(OTA_PORT)" --auth="$(OTA_PASS)" -f "$(BIN)"
 
diff --git a/src/main/main.ino b/mush.ino
index 6c2688f..6c2688f 100644
--- a/src/main/main.ino
+++ b/mush.ino
diff --git a/src/main/ota.h b/ota.h
index 28fb37b..28fb37b 100644
--- a/src/main/ota.h
+++ b/ota.h
diff --git a/src/main/wifiinfo.h b/wifiinfo.h
index fb94cdd..fb94cdd 100644
--- a/src/main/wifiinfo.h
+++ b/wifiinfo.h