Update Makefile to conform to OpenHornet directory layout. Use ROOTDI…

…R instead of relative directories

.gitignore

@@ -1,8 +1,10 @@
 *.bak
+.venv/
 .DS_Store
 ~*.*
 doxyHtml
 doc
 html
 docs/html
 release/
+embedded/**/build/

embedded/Makefile

@@ -1,7 +1,10 @@
-MAKEFILES = $(wildcard **/Makefile)
+MAKEFILES = $(wildcard */*/Makefile)
 SKETCHES := $(dir $(MAKEFILES))
+ROOTDIR := $(abspath $(CURDIR)/..)
 RELEASE_DIR := $(abspath $(CURDIR)/../release)
 
+export
+
 all: $(SKETCHES)
 
 $(SKETCHES):

embedded/OH1_Upper_Instrument_Panel/1A2-MASTER_ARM_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH1_Upper_Instrument_Panel/1A3-L_DDI_AND_EWI/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH1_Upper_Instrument_Panel/1A6-SPIN_RCVY_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH1_Upper_Instrument_Panel/1A7-HUD_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH3_Center_Tub/3A2A1-SEAT_CONTROLS/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A2A1-LDG_GEAR_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A3A1-SELECT_JETT_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A4A2-EXT_LIGHTS_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A5A1-FUEL_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A5A2-APU_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A6A1-FCS_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A7A1-COMM_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-include ../../include/mega2560.mk
-# include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+include $(ROOTDIR)/include/mega2560.mk
+# include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH4_Left_Console/4A7A2-OBOGS_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH5_Right_Console/5A10-DEFOG_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH5_Right_Console/5A6A1-INTR_LT_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH5_Right_Console/5A7A1-SNSR_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH5_Right_Console/5A8A1-SIM_CNTL_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/OH5_Right_Console/5A9A1-KY58_PANEL/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

embedded/templates/OHSketchTemplate/Makefile

@@ -1,8 +1,8 @@
 # Any extra libraries included by this sketch (space separated)
-LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 ArduinoJoystickLibrary
+LIBRARIES = Adafruit_NeoPixel Servo dcs-bios-arduino-library TCA9534 Wire ArduinoJoystickLibrary
 
 # Uncomment one of the following to choose the target board
-# include ../../include/mega2560.mk
-include ../../include/promicro.mk
-# include ../../include/promini.mk
-# include ../../include/s2mini.mk
+# include $(ROOTDIR)/include/mega2560.mk
+include $(ROOTDIR)/include/promicro.mk
+# include $(ROOTDIR)/include/promini.mk
+# include $(ROOTDIR)/include/s2mini.mk

include/avr.mk

@@ -2,11 +2,11 @@
 OBJDIR             = build
 # Set the compiled firmware filename to the directory name (OpenHornet component name)
 TARGET             = $(notdir $(CURDIR))
-ARDUINO_SKETCHBOOK = $(dir $(realpath $(CURDIR)/..))
-ARDMK_DIR          = $(dir $(realpath $(CURDIR)/..))include/Arduino-Makefile
+ARDUINO_SKETCHBOOK = $(ROOTDIR)
+ARDMK_DIR          = $(ROOTDIR)/include/Arduino-Makefile
 ARDUINO_LIBS       = $(LIBRARIES)
 
-include $(dir $(realpath $(CURDIR)/..))include/openhornet.mk
+include $(ROOTDIR)/include/openhornet.mk
 include $(ARDMK_DIR)/Arduino.mk
 
 release: all

include/esp.mk

@@ -1,10 +1,10 @@
 ifndef ESP_ROOT
 # Path to the ESP32 Arduino core.
-ESP_ROOT = $(dir $(realpath $(CURDIR)/..))libraries/arduino-esp32
+ESP_ROOT = $(ROOTDIR)/libraries/arduino-esp32
 endif
 
-LIBRARY_DIR        = $(dir $(realpath $(CURDIR)/..))libraries
-ESPMK_DIR          = $(dir $(realpath $(CURDIR)/..))include/makeEspArduino
+LIBRARY_DIR        = $(ROOTDIR)/libraries
+ESPMK_DIR          = $(ROOTDIR)/include/makeEspArduino
 # Include libraries from the libraries directory for linking.
 CUSTOM_LIBS        = $(LIBRARY_DIR)
 # Exclude platform libraries to avoid compilation and linking errors.
@@ -18,7 +18,7 @@ MAIN_NAME          = $(notdir $(CURDIR))
 # Override them so that the debug build output doesn't fail.
 BUILD_EXTRA_FLAGS  = -DARDUINO_HOST_OS=\"linux\" -DARDUINO_FQBN=\"esp32:esp32:esp32s2\"
 
-include $(dir $(realpath $(CURDIR)/..))include/openhornet.mk
+include $(ROOTDIR)/include/openhornet.mk
 include $(ESPMK_DIR)/makeEspArduino.mk
 
 

include/mega2560.mk

@@ -1,4 +1,4 @@
 BOARD_TAG = mega
 BOARD_SUB = atmega2560
 
-include $(dir $(realpath $(CURDIR)/..))include/avr.mk
+include $(ROOTDIR)/include/avr.mk

include/openhornet.mk

@@ -1 +1 @@
-RELEASE_DIR        = $(dir $(realpath $(CURDIR)/..))release
+RELEASE_DIR        = $(ROOTDIR)/release

include/promicro.mk

@@ -1,5 +1,5 @@
 ifndef PROMICRO_DIR
-PROMICRO_DIR = $(dir $(realpath $(CURDIR)/..))libraries/Arduino_Boards/sparkfun
+PROMICRO_DIR = $(ROOTDIR)/libraries/Arduino_Boards/sparkfun
 endif
 
 ALTERNATE_CORE      = promicro
@@ -14,4 +14,4 @@ BOOTLOADER_FILE     = Caterina-promicro16.hex
 ISP_PROG            = usbasp
 USB_PID             = 0x9206
 
-include $(dir $(realpath $(CURDIR)/..))include/avr.mk
+include $(ROOTDIR)/include/avr.mk

include/promini.mk

@@ -1,4 +1,4 @@
 BOARD_TAG           = pro
 BOARD_SUB           = 8MHzatmega328
 
-include $(dir $(realpath $(CURDIR)/..))include/avr.mk
+include $(ROOTDIR)/include/avr.mk

include/s2mini.mk

@@ -1,3 +1,3 @@
 BOARD     = lolin_s2_mini
 
-include $(dir $(realpath $(CURDIR)/..))include/esp.mk
+include $(ROOTDIR)/include/esp.mk