From f470cb548719fc509a4d99910ed76cdf2968d7ff Mon Sep 17 00:00:00 2001 From: Brad Nelson Date: Sun, 11 Apr 2021 12:09:54 -0700 Subject: [PATCH] Rename arduino things to esp32. While theoretically many things could be general to Arudino, this has gotten confusing. --- ueforth/Makefile | 56 +++++++++---------- ueforth/{arduino => esp32}/autoboot.fs | 0 ueforth/{arduino => esp32}/bindings.fs | 0 .../arduino_bterm.fs => esp32/bterm.fs} | 0 .../esp_camera.fs => esp32/camera.fs} | 0 ueforth/{arduino => esp32}/fuse_ino.js | 0 .../highlevel.fs} | 0 .../{arduino/arduino.fs => esp32/platform.fs} | 0 ueforth/{arduino => esp32}/telnetd.fs | 0 .../template.ino} | 0 .../web_interface.fs} | 0 11 files changed, 28 insertions(+), 28 deletions(-) rename ueforth/{arduino => esp32}/autoboot.fs (100%) rename ueforth/{arduino => esp32}/bindings.fs (100%) rename ueforth/{arduino/arduino_bterm.fs => esp32/bterm.fs} (100%) rename ueforth/{arduino/esp_camera.fs => esp32/camera.fs} (100%) rename ueforth/{arduino => esp32}/fuse_ino.js (100%) rename ueforth/{arduino/arduino_highlevel.fs => esp32/highlevel.fs} (100%) rename ueforth/{arduino/arduino.fs => esp32/platform.fs} (100%) rename ueforth/{arduino => esp32}/telnetd.fs (100%) rename ueforth/{arduino/arduino.template.ino => esp32/template.ino} (100%) rename ueforth/{arduino/arduino_server.fs => esp32/web_interface.fs} (100%) diff --git a/ueforth/Makefile b/ueforth/Makefile index ac3a650..1644860 100644 --- a/ueforth/Makefile +++ b/ueforth/Makefile @@ -7,7 +7,7 @@ RES = $(OUT)/resources WEB = $(OUT)/web POSIX = $(OUT)/posix WINDOWS = $(OUT)/windows -ARDUINO = $(OUT)/arduino +ESP32 = $(OUT)/esp32 DEPLOY = $(OUT)/deploy CFLAGS_COMMON = -O2 -I ./ -I $(OUT) @@ -56,7 +56,7 @@ WIN_LFLAGS64 = /LIBPATH:"c:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Lib TARGETS = $(WEB)/terminal.html \ $(WEB)/ueforth.js \ $(POSIX)/ueforth \ - $(ARDUINO)/ESP32forth/ESP32forth.ino + $(ESP32)/ESP32forth/ESP32forth.ino FINDQ = find 2>/dev/null @@ -140,17 +140,17 @@ WINDOWS_BOOT = common/boot.fs common/conditionals.fs common/vocabulary.fs \ $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN) echo "ok" | cat $(WINDOWS_BOOT) - | $< boot $(VERSION) $(REVISION) >$@ -ARDUINO_BOOT = common/boot.fs common/conditionals.fs common/vocabulary.fs \ - arduino/arduino.fs arduino/arduino_highlevel.fs \ - arduino/bindings.fs common/highlevel.fs \ - common/filetools.fs common/utils.fs common/locals.fs \ - common/tasks.fs common/streams.fs arduino/arduino_server.fs \ - arduino/arduino_bterm.fs arduino/telnetd.fs \ - arduino/esp_camera.fs common/blocks.fs \ - arduino/autoboot.fs \ - common/fini.fs -$(GEN)/arduino_boot.h: common/source_to_string.js $(ARDUINO_BOOT) | $(GEN) - echo "ok" | cat $(ARDUINO_BOOT) - | $< boot $(VERSION) $(REVISION) >$@ +ESP32_BOOT = common/boot.fs common/conditionals.fs common/vocabulary.fs \ + esp32/platform.fs esp32/highlevel.fs \ + esp32/bindings.fs common/highlevel.fs \ + common/filetools.fs common/utils.fs common/locals.fs \ + common/tasks.fs common/streams.fs esp32/web_interface.fs \ + esp32/bterm.fs esp32/telnetd.fs \ + esp32/camera.fs common/blocks.fs \ + esp32/autoboot.fs \ + common/fini.fs +$(GEN)/esp32_boot.h: common/source_to_string.js $(ESP32_BOOT) | $(GEN) + echo "ok" | cat $(ESP32_BOOT) - | $< boot $(VERSION) $(REVISION) >$@ $(GEN)/dump_web_opcodes: web/dump_web_opcodes.c common/opcodes.h | $(GEN) $(CC) $(CFLAGS) $< -o $@ @@ -253,26 +253,26 @@ $(WINDOWS)/uEf64.exe: \ $(RES)/ueforth_res64.res | $(WINDOWS) $(LINK64) /OUT:$@ $(WIN_LFLAGS64) $^ -# ---- ARDUINO ---- +# ---- ESP32 ---- -$(ARDUINO)/ESP32forth: +$(ESP32)/ESP32forth: mkdir -p $@ -ARDUINO_PARTS = arduino/arduino.template.ino \ - common/opcodes.h \ - common/calling.h \ - common/core.h \ - common/interp.h \ - $(GEN)/arduino_boot.h +ESP32_PARTS = esp32/template.ino \ + common/opcodes.h \ + common/calling.h \ + common/core.h \ + common/interp.h \ + $(GEN)/esp32_boot.h -$(ARDUINO)/ESP32forth/ESP32forth.ino: \ - arduino/fuse_ino.js $(ARDUINO_PARTS) | $(ARDUINO)/ESP32forth - $< $(VERSION) $(REVISION) $(ARDUINO_PARTS) >$@ +$(ESP32)/ESP32forth/ESP32forth.ino: \ + esp32/fuse_ino.js $(ESP32_PARTS) | $(ESP32)/ESP32forth + $< $(VERSION) $(REVISION) $(ESP32_PARTS) >$@ # ---- PACKAGE ---- -$(ARDUINO)/ESP32forth.zip: $(ARDUINO)/ESP32forth/ESP32forth.ino - cd $(ARDUINO) && zip -r ESP32forth.zip ESP32forth +$(ESP32)/ESP32forth.zip: $(ESP32)/ESP32forth/ESP32forth.ino + cd $(ESP32) && zip -r ESP32forth.zip ESP32forth # ---- DEPLOY ---- @@ -288,7 +288,7 @@ REPLACE = common/replace.js \ UE_REPLACE = $(REPLACE) FORTH=uEForth ESP_REPLACE = $(REPLACE) FORTH=ESP32forth -$(DEPLOY)/app.yaml: $(ARDUINO)/ESP32forth.zip \ +$(DEPLOY)/app.yaml: $(ESP32)/ESP32forth.zip \ $(wildcard site/*.html) \ site/app.yaml \ site/eforth.go \ @@ -298,7 +298,7 @@ $(DEPLOY)/app.yaml: $(ARDUINO)/ESP32forth.zip \ cp -r site/downloads $(DEPLOY)/downloads cp site/*.go $(DEPLOY)/ cp site/*.yaml $(DEPLOY)/ - cp -r $(ARDUINO)/ESP32forth.zip $(DEPLOY)/downloads + cp -r $(ESP32)/ESP32forth.zip $(DEPLOY)/downloads cp -r $(POSIX)/ueforth $(DEPLOY)/downloads/ueforth.linux cp -r $(WINDOWS)/uEf32.exe $(DEPLOY)/downloads/uEf32.exe cp -r $(WINDOWS)/uEf64.exe $(DEPLOY)/downloads/uEf64.exe diff --git a/ueforth/arduino/autoboot.fs b/ueforth/esp32/autoboot.fs similarity index 100% rename from ueforth/arduino/autoboot.fs rename to ueforth/esp32/autoboot.fs diff --git a/ueforth/arduino/bindings.fs b/ueforth/esp32/bindings.fs similarity index 100% rename from ueforth/arduino/bindings.fs rename to ueforth/esp32/bindings.fs diff --git a/ueforth/arduino/arduino_bterm.fs b/ueforth/esp32/bterm.fs similarity index 100% rename from ueforth/arduino/arduino_bterm.fs rename to ueforth/esp32/bterm.fs diff --git a/ueforth/arduino/esp_camera.fs b/ueforth/esp32/camera.fs similarity index 100% rename from ueforth/arduino/esp_camera.fs rename to ueforth/esp32/camera.fs diff --git a/ueforth/arduino/fuse_ino.js b/ueforth/esp32/fuse_ino.js similarity index 100% rename from ueforth/arduino/fuse_ino.js rename to ueforth/esp32/fuse_ino.js diff --git a/ueforth/arduino/arduino_highlevel.fs b/ueforth/esp32/highlevel.fs similarity index 100% rename from ueforth/arduino/arduino_highlevel.fs rename to ueforth/esp32/highlevel.fs diff --git a/ueforth/arduino/arduino.fs b/ueforth/esp32/platform.fs similarity index 100% rename from ueforth/arduino/arduino.fs rename to ueforth/esp32/platform.fs diff --git a/ueforth/arduino/telnetd.fs b/ueforth/esp32/telnetd.fs similarity index 100% rename from ueforth/arduino/telnetd.fs rename to ueforth/esp32/telnetd.fs diff --git a/ueforth/arduino/arduino.template.ino b/ueforth/esp32/template.ino similarity index 100% rename from ueforth/arduino/arduino.template.ino rename to ueforth/esp32/template.ino diff --git a/ueforth/arduino/arduino_server.fs b/ueforth/esp32/web_interface.fs similarity index 100% rename from ueforth/arduino/arduino_server.fs rename to ueforth/esp32/web_interface.fs