From 061924ae7e471886d310f8edffa7031d87ea07fb Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 17 Jul 2023 09:53:55 -0700 Subject: [PATCH 1/8] WIP --- Makefile | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 332 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..188f7679f --- /dev/null +++ b/Makefile @@ -0,0 +1,332 @@ +LIBRARIES=/Users/jfoster/Documents/Arduino/libraries +ARDUINO_CI=$(LIBRARIES)/TankController/vendor/bundle/ruby/3.2.0/bundler/gems/arduino_ci-bc9c7e5b3bc3/cpp +SRC=$(LIBRARIES)/TankController/src +BIN=$(LIBRARIES)/TankController/.arduino_ci + +FLAGS=-std=c++0x \ + -shared \ + -fPIC \ + -Wl,-undefined,dynamic_lookup \ + -Wno-deprecated-declarations \ + -L$(LIBRARIES)/TankController/.arduino_ci \ + -DARDUINO=100 \ + -g \ + -O1 \ + -fno-omit-frame-pointer \ + -fno-optimize-sibling-calls \ + -fsanitize=address \ + -Wno-unknown-attributes \ + -Wno-address-of-packed-member \ + -D__AVR__ \ + -D__AVR_ATmega2560__ \ + -DARDUINO_ARCH_AVR \ + -DARDUINO_AVR_MEGA2560 + +INCLUDE=-I$(ARDUINO_CI)/arduino \ + -I$(ARDUINO_CI)/unittest \ + -I$(LIBRARIES)/TankController/src \ + -I$(LIBRARIES)/TankController/src/Devices \ + -I$(LIBRARIES)/TankController/src/UIState \ + -I$(LIBRARIES)/Adafruit_BusIO/src \ + -I$(LIBRARIES)/Adafruit_MAX31865_library/src \ + -I$(LIBRARIES)/PID/src \ + -I$(LIBRARIES)/Ethernet/src \ + -I$(LIBRARIES)/Ethernet/src/utility \ + -I$(LIBRARIES)/LiquidCrystal/src \ + -I$(LIBRARIES)/RTClib/src \ + -I$(LIBRARIES)/Keypad/src \ + -I$(LIBRARIES)/SdFat/src \ + -I$(LIBRARIES)/SdFat/src/ArduinoCI \ + -I$(LIBRARIES)/SdFat/src/DigitalIO \ + -I$(LIBRARIES)/SdFat/src/DigitalIO/boards \ + -I$(LIBRARIES)/SdFat/src/ExFatLib \ + -I$(LIBRARIES)/SdFat/src/FatLib \ + -I$(LIBRARIES)/SdFat/src/FsLib \ + -I$(LIBRARIES)/SdFat/src/SdCard \ + -I$(LIBRARIES)/SdFat/src/SpiDriver \ + -I$(LIBRARIES)/SdFat/src/common \ + -I$(LIBRARIES)/SdFat/src/iostream + +OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTests.o \ + $(BIN)/TC_util.o $(BIN)/TankController.o $(BIN)/DataLogger_TC.o $(BIN)/DateTime_TC.o \ + $(BIN)/EEPROM_TC.o $(BIN)/EthernetServer_TC.o $(BIN)/Ethernet_TC.o $(BIN)/JSONBuilder.o \ + $(BIN)/Keypad_TC.o $(BIN)/LiquidCrystal_TC.o $(BIN)/PHControl.o $(BIN)/PHProbe.o \ + $(BIN)/PID_TC.o $(BIN)/PushingBox.o $(BIN)/SD_TC.o $(BIN)/Serial_TC.o $(BIN)/TempProbe_TC.o \ + $(BIN)/TemperatureControl.o $(BIN)/CalibrationManagement.o $(BIN)/EnablePID.o $(BIN)/MainMenu.o \ + $(BIN)/NumberCollectorState.o $(BIN)/PHCalibrationHigh.o $(BIN)/PHCalibrationLow.o \ + $(BIN)/PHCalibrationMid.o $(BIN)/SeeDeviceAddress.o $(BIN)/SeeDeviceUptime.o $(BIN)/SeeFreeMemory.o \ + $(BIN)/SeeGoogleMins.o $(BIN)/SeeLogFile.o $(BIN)/SeePHSlope.o $(BIN)/SeePIDConstants.o \ + $(BIN)/SeePh.o $(BIN)/SeeTankID.o $(BIN)/SeeTempCalOffset.o $(BIN)/SeeVersion.o \ + $(BIN)/SetChillOrHeat.o $(BIN)/SetGoogleSheetInterval.o $(BIN)/SetKD.o $(BIN)/SetKI.o \ + $(BIN)/SetKP.o $(BIN)/SetPHCalibClear.o $(BIN)/SetPHSetPoint.o $(BIN)/SetPHWithSine.o \ + $(BIN)/SetTankID.o $(BIN)/SetTempCalibClear.o $(BIN)/SetTempSetPoint.o $(BIN)/SetTempWithSine.o \ + $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o \ + $(BIN)/BusIO.o $(BIN)/MAX31865.o $(BIN)/PID.o $(BIN)/Ethernet.o $(BIN)/LiquidCrystal.o \ + $(BIN)/RTClib.o $(BIN)/Keypad.o $(BIN)/SdFat.o +$(BIN)/libarduino.so: $(OBJECTS) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) + +$(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp + +$(BIN)/Godmode.o: $(ARDUINO_CI)/arduino/Godmode.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Godmode.o $(ARDUINO_CI)/arduino/Godmode.cpp + +$(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp + +$(BIN)/ArduinoUnitTests.o: $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/ArduinoUnitTests.o $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp + +$(BIN)/TC_util.o: $(SRC)/TC_util.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TC_util.o $(SRC)/TC_util.cpp + +$(BIN)/TankController.o: $(SRC)/TankController.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TankController.o $(SRC)/TankController.cpp + +$(BIN)/DataLogger_TC.o: $(SRC)/Devices/DataLogger_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/DataLogger_TC.o $(SRC)/Devices/DataLogger_TC.cpp + +$(BIN)/DateTime_TC.o: $(SRC)/Devices/DateTime_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/DateTime_TC.o $(SRC)/Devices/DateTime_TC.cpp + +$(BIN)/EEPROM_TC.o: $(SRC)/Devices/EEPROM_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EEPROM_TC.o $(SRC)/Devices/EEPROM_TC.cpp + +$(BIN)/EthernetServer_TC.o: $(SRC)/Devices/EthernetServer_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetServer_TC.o $(SRC)/Devices/EthernetServer_TC.cpp + +$(BIN)/Ethernet_TC.o: $(SRC)/Devices/Ethernet_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet_TC.o $(SRC)/Devices/Ethernet_TC.cpp + +$(BIN)/JSONBuilder.o: $(SRC)/Devices/JSONBuilder.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/JSONBuilder.o $(SRC)/Devices/JSONBuilder.cpp + +$(BIN)/Keypad_TC.o: $(SRC)/Devices/Keypad_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad_TC.o $(SRC)/Devices/Keypad_TC.cpp + +$(BIN)/LiquidCrystal_TC.o: $(SRC)/Devices/LiquidCrystal_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal_TC.o $(SRC)/Devices/LiquidCrystal_TC.cpp + +$(BIN)/PHControl.o: $(SRC)/Devices/PHControl.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHControl.o $(SRC)/Devices/PHControl.cpp + +$(BIN)/PHProbe.o: $(SRC)/Devices/PHProbe.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHProbe.o $(SRC)/Devices/PHProbe.cpp + +$(BIN)/PID_TC.o: $(SRC)/Devices/PID_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PID_TC.o $(SRC)/Devices/PID_TC.cpp + +$(BIN)/PushingBox.o: $(SRC)/Devices/PushingBox.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PushingBox.o $(SRC)/Devices/PushingBox.cpp + +$(BIN)/SD_TC.o: $(SRC)/Devices/SD_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SD_TC.o $(SRC)/Devices/SD_TC.cpp + +$(BIN)/Serial_TC.o: $(SRC)/Devices/Serial_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Serial_TC.o $(SRC)/Devices/Serial_TC.cpp + +$(BIN)/TempProbe_TC.o: $(SRC)/Devices/TempProbe_TC.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TempProbe_TC.o $(SRC)/Devices/TempProbe_TC.cpp + +$(BIN)/TemperatureControl.o: $(SRC)/Devices/TemperatureControl.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureControl.o $(SRC)/Devices/TemperatureControl.cpp + +$(BIN)/CalibrationManagement.o: $(SRC)/UIState/CalibrationManagement.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/CalibrationManagement.o $(SRC)/UIState/CalibrationManagement.cpp + +$(BIN)/EnablePID.o: $(SRC)/UIState/EnablePID.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EnablePID.o $(SRC)/UIState/EnablePID.cpp + +$(BIN)/MainMenu.o: $(SRC)/UIState/MainMenu.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/MainMenu.o $(SRC)/UIState/MainMenu.cpp + +$(BIN)/NumberCollectorState.o: $(SRC)/UIState/NumberCollectorState.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/NumberCollectorState.o $(SRC)/UIState/NumberCollectorState.cpp + +$(BIN)/PHCalibrationHigh.o: $(SRC)/UIState/PHCalibrationHigh.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationHigh.o $(SRC)/UIState/PHCalibrationHigh.cpp + +$(BIN)/PHCalibrationLow.o: $(SRC)/UIState/PHCalibrationLow.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationLow.o $(SRC)/UIState/PHCalibrationLow.cpp + +$(BIN)/PHCalibrationMid.o: $(SRC)/UIState/PHCalibrationMid.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationMid.o $(SRC)/UIState/PHCalibrationMid.cpp + +$(BIN)/SeeDeviceAddress.o: $(SRC)/UIState/SeeDeviceAddress.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceAddress.o $(SRC)/UIState/SeeDeviceAddress.cpp + +$(BIN)/SeeDeviceUptime.o: $(SRC)/UIState/SeeDeviceUptime.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceUptime.o $(SRC)/UIState/SeeDeviceUptime.cpp + +$(BIN)/SeeFreeMemory.o: $(SRC)/UIState/SeeFreeMemory.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeFreeMemory.o $(SRC)/UIState/SeeFreeMemory.cpp + +$(BIN)/SeeGoogleMins.o: $(SRC)/UIState/SeeGoogleMins.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeGoogleMins.o $(SRC)/UIState/SeeGoogleMins.cpp + +$(BIN)/SeeLogFile.o: $(SRC)/UIState/SeeLogFile.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeLogFile.o $(SRC)/UIState/SeeLogFile.cpp + +$(BIN)/SeePHSlope.o: $(SRC)/UIState/SeePHSlope.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePHSlope.o $(SRC)/UIState/SeePHSlope.cpp + +$(BIN)/SeePIDConstants.o: $(SRC)/UIState/SeePIDConstants.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePIDConstants.o $(SRC)/UIState/SeePIDConstants.cpp + +$(BIN)/SeePh.o: $(SRC)/UIState/SeePh.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePh.o $(SRC)/UIState/SeePh.cpp + +$(BIN)/SeeTankID.o: $(SRC)/UIState/SeeTankID.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTankID.o $(SRC)/UIState/SeeTankID.cpp + +$(BIN)/SeeTempCalOffset.o: $(SRC)/UIState/SeeTempCalOffset.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTempCalOffset.o $(SRC)/UIState/SeeTempCalOffset.cpp + +$(BIN)/SeeVersion.o: $(SRC)/UIState/SeeVersion.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeVersion.o $(SRC)/UIState/SeeVersion.cpp + +$(BIN)/SetChillOrHeat.o: $(SRC)/UIState/SetChillOrHeat.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetChillOrHeat.o $(SRC)/UIState/SetChillOrHeat.cpp + +$(BIN)/SetGoogleSheetInterval.o: $(SRC)/UIState/SetGoogleSheetInterval.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetGoogleSheetInterval.o $(SRC)/UIState/SetGoogleSheetInterval.cpp + +$(BIN)/SetKD.o: $(SRC)/UIState/SetKD.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKD.o $(SRC)/UIState/SetKD.cpp + +$(BIN)/SetKI.o: $(SRC)/UIState/SetKI.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKI.o $(SRC)/UIState/SetKI.cpp + +$(BIN)/SetKP.o: $(SRC)/UIState/SetKP.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKP.o $(SRC)/UIState/SetKP.cpp + +$(BIN)/SetPHCalibClear.o: $(SRC)/UIState/SetPHCalibClear.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHCalibClear.o $(SRC)/UIState/SetPHCalibClear.cpp + +$(BIN)/SetPHSetPoint.o: $(SRC)/UIState/SetPHSetPoint.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHSetPoint.o $(SRC)/UIState/SetPHSetPoint.cpp + +$(BIN)/SetPHWithSine.o: $(SRC)/UIState/SetPHWithSine.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHWithSine.o $(SRC)/UIState/SetPHWithSine.cpp + +$(BIN)/SetTankID.o: $(SRC)/UIState/SetTankID.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTankID.o $(SRC)/UIState/SetTankID.cpp + +$(BIN)/SetTempCalibClear.o: $(SRC)/UIState/SetTempCalibClear.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempCalibClear.o $(SRC)/UIState/SetTempCalibClear.cpp + +$(BIN)/SetTempSetPoint.o: $(SRC)/UIState/SetTempSetPoint.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempSetPoint.o $(SRC)/UIState/SetTempSetPoint.cpp + +$(BIN)/SetTempWithSine.o: $(SRC)/UIState/SetTempWithSine.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempWithSine.o $(SRC)/UIState/SetTempWithSine.cpp + +$(BIN)/SetTime.o: $(SRC)/UIState/SetTime.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTime.o $(SRC)/UIState/SetTime.cpp + +$(BIN)/TemperatureCalibration.o: $(SRC)/UIState/TemperatureCalibration.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureCalibration.o $(SRC)/UIState/TemperatureCalibration.cpp + +$(BIN)/UIState.o: $(SRC)/UIState/UIState.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/UIState.o $(SRC)/UIState/UIState.cpp + +$(BIN)/Wait.o: $(SRC)/UIState/Wait.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Wait.o $(SRC)/UIState/Wait.cpp + +BUSIO=$(LIBRARIES)/Adafruit_BusIO/src/Adafruit_BusIO_Register.cpp \ + $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_I2CDevice.cpp \ + $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_SPIDevice.cpp +$(BIN)/BusIO.o: $(BUSIO) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/BusIO.o $(BUSIO) + +MAX31865=$(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865.cpp \ + $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865_CI.cpp +$(BIN)/MAX31865.o: $(MAX31865) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/MAX31865.o $(MAX31865) + +$(BIN)/PID.o: $(LIBRARIES)/PID/src/PID_v1.cpp + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PID.o $(LIBRARIES)/PID/src/PID_v1.cpp + +ETHERNET=$(LIBRARIES)/Ethernet/src/Dhcp.cpp \ + $(LIBRARIES)/Ethernet/src/Dns.cpp \ + $(LIBRARIES)/Ethernet/src/Ethernet.cpp \ + $(LIBRARIES)/Ethernet/src/EthernetClient.cpp \ + $(LIBRARIES)/Ethernet/src/EthernetClient_CI.cpp \ + $(LIBRARIES)/Ethernet/src/EthernetServer.cpp \ + $(LIBRARIES)/Ethernet/src/EthernetServer_CI.cpp \ + $(LIBRARIES)/Ethernet/src/EthernetUdp.cpp \ + $(LIBRARIES)/Ethernet/src/Ethernet_CI.cpp \ + $(LIBRARIES)/Ethernet/src/socket.cpp \ + $(LIBRARIES)/Ethernet/src/utility/w5100.cpp +$(BIN)/Ethernet.o: $(ETHERNET) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet.o $(ETHERNET) + +LCD=$(LIBRARIES)/LiquidCrystal/src/LiquidCrystal.cpp \ + $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal_CI.cpp +$(BIN)/LiquidCrystal.o: $(LCD) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal.o $(LCD) + +RTC=$(LIBRARIES)/RTClib/src/RTC_DS1307.cpp \ + $(LIBRARIES)/RTClib/src/RTC_DS3231.cpp \ + $(LIBRARIES)/RTClib/src/RTC_Micros.cpp \ + $(LIBRARIES)/RTClib/src/RTC_Millis.cpp \ + $(LIBRARIES)/RTClib/src/RTC_PCF8523.cpp \ + $(LIBRARIES)/RTClib/src/RTC_PCF8563.cpp \ + $(LIBRARIES)/RTClib/src/RTClib.cpp \ + $(LIBRARIES)/RTClib/src/RTClib_CI.cpp +$(BIN)/RTClib.o: $(RTC) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/RTClib.o $(RTC) + +KEYPAD=$(LIBRARIES)/Keypad/src/Key.cpp \ + $(LIBRARIES)/Keypad/src/Keypad.cpp \ + $(LIBRARIES)/Keypad/src/Keypad_CI.cpp +$(BIN)/Keypad.o: $(KEYPAD) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad.o $(KEYPAD) + +SDFAT=$(LIBRARIES)/SdFat/src/FreeStack.cpp \ + $(LIBRARIES)/SdFat/src/MinimumSerial.cpp \ + $(LIBRARIES)/SdFat/src/ArduinoCI/File_CI.cpp \ + $(LIBRARIES)/SdFat/src/ArduinoCI/SD_CI.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatDbg.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFile.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFilePrint.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFileWrite.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFormatter.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatName.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatPartition.cpp \ + $(LIBRARIES)/SdFat/src/ExFatLib/ExFatVolume.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatDbg.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatFormatter.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatName.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatPartition.cpp \ + $(LIBRARIES)/SdFat/src/FatLib/FatVolume.cpp \ + $(LIBRARIES)/SdFat/src/FsLib/FsFile.cpp \ + $(LIBRARIES)/SdFat/src/FsLib/FsNew.cpp \ + $(LIBRARIES)/SdFat/src/FsLib/FsVolume.cpp \ + $(LIBRARIES)/SdFat/src/SdCard/SdCardInfo.cpp \ + $(LIBRARIES)/SdFat/src/SdCard/SdSpiCard.cpp \ + $(LIBRARIES)/SdFat/src/SdCard/SdioTeensy.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiArtemis.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiChipSelect.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiDue.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiESP.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiParticle.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32Core.cpp \ + $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiTeensy3.cpp \ + $(LIBRARIES)/SdFat/src/common/FmtNumber.cpp \ + $(LIBRARIES)/SdFat/src/common/FsCache.cpp \ + $(LIBRARIES)/SdFat/src/common/FsDateTime.cpp \ + $(LIBRARIES)/SdFat/src/common/FsName.cpp \ + $(LIBRARIES)/SdFat/src/common/FsStructs.cpp \ + $(LIBRARIES)/SdFat/src/common/FsUtf.cpp \ + $(LIBRARIES)/SdFat/src/common/PrintBasic.cpp \ + $(LIBRARIES)/SdFat/src/common/upcase.cpp \ + $(LIBRARIES)/SdFat/src/iostream/StdioStream.cpp \ + $(LIBRARIES)/SdFat/src/iostream/StreamBaseClass.cpp \ + $(LIBRARIES)/SdFat/src/iostream/istream.cpp \ + $(LIBRARIES)/SdFat/src/iostream/ostream.cpp +$(BIN)/SdFat.o: $(SDFAT) + g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SdFat.o $(SDFAT) From 583a596abc6bdbcde10b555855493e55cb8585c5 Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 17 Jul 2023 13:17:27 -0700 Subject: [PATCH 2/8] WIP: now compiling and linking without errors but does not run! --- Makefile | 181 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 80 deletions(-) diff --git a/Makefile b/Makefile index 188f7679f..788f0744b 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ LIBRARIES=/Users/jfoster/Documents/Arduino/libraries ARDUINO_CI=$(LIBRARIES)/TankController/vendor/bundle/ruby/3.2.0/bundler/gems/arduino_ci-bc9c7e5b3bc3/cpp SRC=$(LIBRARIES)/TankController/src +TEST=$(LIBRARIES)/TankController/test BIN=$(LIBRARIES)/TankController/.arduino_ci FLAGS=-std=c++0x \ - -shared \ - -fPIC \ - -Wl,-undefined,dynamic_lookup \ -Wno-deprecated-declarations \ - -L$(LIBRARIES)/TankController/.arduino_ci \ -DARDUINO=100 \ -g \ -O1 \ @@ -47,6 +44,19 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \ -I$(LIBRARIES)/SdFat/src/common \ -I$(LIBRARIES)/SdFat/src/iostream +.PHONY : all +all : $(BIN)/BlinkTest.cpp.bin + + +LIBS_SO=$(BIN)/libBusIO.so $(BIN)/libMAX31865.so $(BIN)/libPID.so $(BIN)/libEthernet.so \ + $(BIN)/libLiquidCrystal.so $(BIN)/libRTClib.so $(BIN)/libKeypad.so $(BIN)/libSdFat.so \ + $(BIN)/libarduino.so +LIBS=-lBusIO -lMAX31865 -lPID -lEthernet -lLiquidCrystal -lRTClib -lKeypad -lSdFat -larduino +GPP_TEST=g++ $(FLAGS) -L$(LIBRARIES)/TankController/.arduino_ci $(INCLUDE) + +$(BIN)/BlinkTest.cpp.bin: $(LIBS_SO) $(TEST)/BlinkTest.cpp + $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp $(LIBS) + OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTests.o \ $(BIN)/TC_util.o $(BIN)/TankController.o $(BIN)/DataLogger_TC.o $(BIN)/DateTime_TC.o \ $(BIN)/EEPROM_TC.o $(BIN)/EthernetServer_TC.o $(BIN)/Ethernet_TC.o $(BIN)/JSONBuilder.o \ @@ -60,193 +70,195 @@ OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTest $(BIN)/SetChillOrHeat.o $(BIN)/SetGoogleSheetInterval.o $(BIN)/SetKD.o $(BIN)/SetKI.o \ $(BIN)/SetKP.o $(BIN)/SetPHCalibClear.o $(BIN)/SetPHSetPoint.o $(BIN)/SetPHWithSine.o \ $(BIN)/SetTankID.o $(BIN)/SetTempCalibClear.o $(BIN)/SetTempSetPoint.o $(BIN)/SetTempWithSine.o \ - $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o \ - $(BIN)/BusIO.o $(BIN)/MAX31865.o $(BIN)/PID.o $(BIN)/Ethernet.o $(BIN)/LiquidCrystal.o \ - $(BIN)/RTClib.o $(BIN)/Keypad.o $(BIN)/SdFat.o + $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o $(BIN)/libarduino.so: $(OBJECTS) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) + g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(LIBRARIES)/TankController/.arduino_ci \ + $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) $(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp $(BIN)/Godmode.o: $(ARDUINO_CI)/arduino/Godmode.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Godmode.o $(ARDUINO_CI)/arduino/Godmode.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Godmode.o $(ARDUINO_CI)/arduino/Godmode.cpp $(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp $(BIN)/ArduinoUnitTests.o: $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/ArduinoUnitTests.o $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ArduinoUnitTests.o $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp $(BIN)/TC_util.o: $(SRC)/TC_util.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TC_util.o $(SRC)/TC_util.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TC_util.o $(SRC)/TC_util.cpp $(BIN)/TankController.o: $(SRC)/TankController.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TankController.o $(SRC)/TankController.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TankController.o $(SRC)/TankController.cpp $(BIN)/DataLogger_TC.o: $(SRC)/Devices/DataLogger_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/DataLogger_TC.o $(SRC)/Devices/DataLogger_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/DataLogger_TC.o $(SRC)/Devices/DataLogger_TC.cpp $(BIN)/DateTime_TC.o: $(SRC)/Devices/DateTime_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/DateTime_TC.o $(SRC)/Devices/DateTime_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/DateTime_TC.o $(SRC)/Devices/DateTime_TC.cpp $(BIN)/EEPROM_TC.o: $(SRC)/Devices/EEPROM_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EEPROM_TC.o $(SRC)/Devices/EEPROM_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EEPROM_TC.o $(SRC)/Devices/EEPROM_TC.cpp $(BIN)/EthernetServer_TC.o: $(SRC)/Devices/EthernetServer_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetServer_TC.o $(SRC)/Devices/EthernetServer_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetServer_TC.o $(SRC)/Devices/EthernetServer_TC.cpp $(BIN)/Ethernet_TC.o: $(SRC)/Devices/Ethernet_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet_TC.o $(SRC)/Devices/Ethernet_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet_TC.o $(SRC)/Devices/Ethernet_TC.cpp $(BIN)/JSONBuilder.o: $(SRC)/Devices/JSONBuilder.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/JSONBuilder.o $(SRC)/Devices/JSONBuilder.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/JSONBuilder.o $(SRC)/Devices/JSONBuilder.cpp $(BIN)/Keypad_TC.o: $(SRC)/Devices/Keypad_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad_TC.o $(SRC)/Devices/Keypad_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad_TC.o $(SRC)/Devices/Keypad_TC.cpp $(BIN)/LiquidCrystal_TC.o: $(SRC)/Devices/LiquidCrystal_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal_TC.o $(SRC)/Devices/LiquidCrystal_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal_TC.o $(SRC)/Devices/LiquidCrystal_TC.cpp $(BIN)/PHControl.o: $(SRC)/Devices/PHControl.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHControl.o $(SRC)/Devices/PHControl.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PHControl.o $(SRC)/Devices/PHControl.cpp $(BIN)/PHProbe.o: $(SRC)/Devices/PHProbe.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHProbe.o $(SRC)/Devices/PHProbe.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PHProbe.o $(SRC)/Devices/PHProbe.cpp $(BIN)/PID_TC.o: $(SRC)/Devices/PID_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PID_TC.o $(SRC)/Devices/PID_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PID_TC.o $(SRC)/Devices/PID_TC.cpp $(BIN)/PushingBox.o: $(SRC)/Devices/PushingBox.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PushingBox.o $(SRC)/Devices/PushingBox.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PushingBox.o $(SRC)/Devices/PushingBox.cpp $(BIN)/SD_TC.o: $(SRC)/Devices/SD_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SD_TC.o $(SRC)/Devices/SD_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SD_TC.o $(SRC)/Devices/SD_TC.cpp $(BIN)/Serial_TC.o: $(SRC)/Devices/Serial_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Serial_TC.o $(SRC)/Devices/Serial_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Serial_TC.o $(SRC)/Devices/Serial_TC.cpp $(BIN)/TempProbe_TC.o: $(SRC)/Devices/TempProbe_TC.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TempProbe_TC.o $(SRC)/Devices/TempProbe_TC.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TempProbe_TC.o $(SRC)/Devices/TempProbe_TC.cpp $(BIN)/TemperatureControl.o: $(SRC)/Devices/TemperatureControl.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureControl.o $(SRC)/Devices/TemperatureControl.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureControl.o $(SRC)/Devices/TemperatureControl.cpp $(BIN)/CalibrationManagement.o: $(SRC)/UIState/CalibrationManagement.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/CalibrationManagement.o $(SRC)/UIState/CalibrationManagement.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/CalibrationManagement.o $(SRC)/UIState/CalibrationManagement.cpp $(BIN)/EnablePID.o: $(SRC)/UIState/EnablePID.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/EnablePID.o $(SRC)/UIState/EnablePID.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EnablePID.o $(SRC)/UIState/EnablePID.cpp $(BIN)/MainMenu.o: $(SRC)/UIState/MainMenu.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/MainMenu.o $(SRC)/UIState/MainMenu.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/MainMenu.o $(SRC)/UIState/MainMenu.cpp $(BIN)/NumberCollectorState.o: $(SRC)/UIState/NumberCollectorState.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/NumberCollectorState.o $(SRC)/UIState/NumberCollectorState.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/NumberCollectorState.o $(SRC)/UIState/NumberCollectorState.cpp $(BIN)/PHCalibrationHigh.o: $(SRC)/UIState/PHCalibrationHigh.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationHigh.o $(SRC)/UIState/PHCalibrationHigh.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationHigh.o $(SRC)/UIState/PHCalibrationHigh.cpp $(BIN)/PHCalibrationLow.o: $(SRC)/UIState/PHCalibrationLow.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationLow.o $(SRC)/UIState/PHCalibrationLow.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationLow.o $(SRC)/UIState/PHCalibrationLow.cpp $(BIN)/PHCalibrationMid.o: $(SRC)/UIState/PHCalibrationMid.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationMid.o $(SRC)/UIState/PHCalibrationMid.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PHCalibrationMid.o $(SRC)/UIState/PHCalibrationMid.cpp $(BIN)/SeeDeviceAddress.o: $(SRC)/UIState/SeeDeviceAddress.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceAddress.o $(SRC)/UIState/SeeDeviceAddress.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceAddress.o $(SRC)/UIState/SeeDeviceAddress.cpp $(BIN)/SeeDeviceUptime.o: $(SRC)/UIState/SeeDeviceUptime.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceUptime.o $(SRC)/UIState/SeeDeviceUptime.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeDeviceUptime.o $(SRC)/UIState/SeeDeviceUptime.cpp $(BIN)/SeeFreeMemory.o: $(SRC)/UIState/SeeFreeMemory.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeFreeMemory.o $(SRC)/UIState/SeeFreeMemory.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeFreeMemory.o $(SRC)/UIState/SeeFreeMemory.cpp $(BIN)/SeeGoogleMins.o: $(SRC)/UIState/SeeGoogleMins.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeGoogleMins.o $(SRC)/UIState/SeeGoogleMins.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeGoogleMins.o $(SRC)/UIState/SeeGoogleMins.cpp $(BIN)/SeeLogFile.o: $(SRC)/UIState/SeeLogFile.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeLogFile.o $(SRC)/UIState/SeeLogFile.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeLogFile.o $(SRC)/UIState/SeeLogFile.cpp $(BIN)/SeePHSlope.o: $(SRC)/UIState/SeePHSlope.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePHSlope.o $(SRC)/UIState/SeePHSlope.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeePHSlope.o $(SRC)/UIState/SeePHSlope.cpp $(BIN)/SeePIDConstants.o: $(SRC)/UIState/SeePIDConstants.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePIDConstants.o $(SRC)/UIState/SeePIDConstants.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeePIDConstants.o $(SRC)/UIState/SeePIDConstants.cpp $(BIN)/SeePh.o: $(SRC)/UIState/SeePh.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeePh.o $(SRC)/UIState/SeePh.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeePh.o $(SRC)/UIState/SeePh.cpp $(BIN)/SeeTankID.o: $(SRC)/UIState/SeeTankID.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTankID.o $(SRC)/UIState/SeeTankID.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTankID.o $(SRC)/UIState/SeeTankID.cpp $(BIN)/SeeTempCalOffset.o: $(SRC)/UIState/SeeTempCalOffset.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTempCalOffset.o $(SRC)/UIState/SeeTempCalOffset.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeTempCalOffset.o $(SRC)/UIState/SeeTempCalOffset.cpp $(BIN)/SeeVersion.o: $(SRC)/UIState/SeeVersion.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SeeVersion.o $(SRC)/UIState/SeeVersion.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SeeVersion.o $(SRC)/UIState/SeeVersion.cpp $(BIN)/SetChillOrHeat.o: $(SRC)/UIState/SetChillOrHeat.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetChillOrHeat.o $(SRC)/UIState/SetChillOrHeat.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetChillOrHeat.o $(SRC)/UIState/SetChillOrHeat.cpp $(BIN)/SetGoogleSheetInterval.o: $(SRC)/UIState/SetGoogleSheetInterval.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetGoogleSheetInterval.o $(SRC)/UIState/SetGoogleSheetInterval.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetGoogleSheetInterval.o $(SRC)/UIState/SetGoogleSheetInterval.cpp $(BIN)/SetKD.o: $(SRC)/UIState/SetKD.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKD.o $(SRC)/UIState/SetKD.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetKD.o $(SRC)/UIState/SetKD.cpp $(BIN)/SetKI.o: $(SRC)/UIState/SetKI.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKI.o $(SRC)/UIState/SetKI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetKI.o $(SRC)/UIState/SetKI.cpp $(BIN)/SetKP.o: $(SRC)/UIState/SetKP.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetKP.o $(SRC)/UIState/SetKP.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetKP.o $(SRC)/UIState/SetKP.cpp $(BIN)/SetPHCalibClear.o: $(SRC)/UIState/SetPHCalibClear.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHCalibClear.o $(SRC)/UIState/SetPHCalibClear.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHCalibClear.o $(SRC)/UIState/SetPHCalibClear.cpp $(BIN)/SetPHSetPoint.o: $(SRC)/UIState/SetPHSetPoint.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHSetPoint.o $(SRC)/UIState/SetPHSetPoint.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHSetPoint.o $(SRC)/UIState/SetPHSetPoint.cpp $(BIN)/SetPHWithSine.o: $(SRC)/UIState/SetPHWithSine.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHWithSine.o $(SRC)/UIState/SetPHWithSine.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetPHWithSine.o $(SRC)/UIState/SetPHWithSine.cpp $(BIN)/SetTankID.o: $(SRC)/UIState/SetTankID.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTankID.o $(SRC)/UIState/SetTankID.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetTankID.o $(SRC)/UIState/SetTankID.cpp $(BIN)/SetTempCalibClear.o: $(SRC)/UIState/SetTempCalibClear.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempCalibClear.o $(SRC)/UIState/SetTempCalibClear.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempCalibClear.o $(SRC)/UIState/SetTempCalibClear.cpp $(BIN)/SetTempSetPoint.o: $(SRC)/UIState/SetTempSetPoint.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempSetPoint.o $(SRC)/UIState/SetTempSetPoint.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempSetPoint.o $(SRC)/UIState/SetTempSetPoint.cpp $(BIN)/SetTempWithSine.o: $(SRC)/UIState/SetTempWithSine.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempWithSine.o $(SRC)/UIState/SetTempWithSine.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetTempWithSine.o $(SRC)/UIState/SetTempWithSine.cpp $(BIN)/SetTime.o: $(SRC)/UIState/SetTime.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SetTime.o $(SRC)/UIState/SetTime.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SetTime.o $(SRC)/UIState/SetTime.cpp $(BIN)/TemperatureCalibration.o: $(SRC)/UIState/TemperatureCalibration.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureCalibration.o $(SRC)/UIState/TemperatureCalibration.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TemperatureCalibration.o $(SRC)/UIState/TemperatureCalibration.cpp $(BIN)/UIState.o: $(SRC)/UIState/UIState.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/UIState.o $(SRC)/UIState/UIState.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/UIState.o $(SRC)/UIState/UIState.cpp $(BIN)/Wait.o: $(SRC)/UIState/Wait.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Wait.o $(SRC)/UIState/Wait.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Wait.o $(SRC)/UIState/Wait.cpp BUSIO=$(LIBRARIES)/Adafruit_BusIO/src/Adafruit_BusIO_Register.cpp \ $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_I2CDevice.cpp \ $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_SPIDevice.cpp -$(BIN)/BusIO.o: $(BUSIO) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/BusIO.o $(BUSIO) +$(BIN)/libBusIO.so: $(BUSIO) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libBusIO.so $(BUSIO) MAX31865=$(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865.cpp \ $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865_CI.cpp -$(BIN)/MAX31865.o: $(MAX31865) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/MAX31865.o $(MAX31865) +$(BIN)/libMAX31865.so: $(MAX31865) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libMAX31865.so $(MAX31865) -$(BIN)/PID.o: $(LIBRARIES)/PID/src/PID_v1.cpp - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/PID.o $(LIBRARIES)/PID/src/PID_v1.cpp +$(BIN)/libPID.so: $(LIBRARIES)/PID/src/PID_v1.cpp + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libPID.so $(LIBRARIES)/PID/src/PID_v1.cpp ETHERNET=$(LIBRARIES)/Ethernet/src/Dhcp.cpp \ $(LIBRARIES)/Ethernet/src/Dns.cpp \ @@ -259,13 +271,15 @@ ETHERNET=$(LIBRARIES)/Ethernet/src/Dhcp.cpp \ $(LIBRARIES)/Ethernet/src/Ethernet_CI.cpp \ $(LIBRARIES)/Ethernet/src/socket.cpp \ $(LIBRARIES)/Ethernet/src/utility/w5100.cpp -$(BIN)/Ethernet.o: $(ETHERNET) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet.o $(ETHERNET) +$(BIN)/libEthernet.so: $(ETHERNET) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libEthernet.so $(ETHERNET) LCD=$(LIBRARIES)/LiquidCrystal/src/LiquidCrystal.cpp \ $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal_CI.cpp -$(BIN)/LiquidCrystal.o: $(LCD) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal.o $(LCD) +$(BIN)/libLiquidCrystal.so: $(LCD) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libLiquidCrystal.so $(LCD) RTC=$(LIBRARIES)/RTClib/src/RTC_DS1307.cpp \ $(LIBRARIES)/RTClib/src/RTC_DS3231.cpp \ @@ -275,14 +289,16 @@ RTC=$(LIBRARIES)/RTClib/src/RTC_DS1307.cpp \ $(LIBRARIES)/RTClib/src/RTC_PCF8563.cpp \ $(LIBRARIES)/RTClib/src/RTClib.cpp \ $(LIBRARIES)/RTClib/src/RTClib_CI.cpp -$(BIN)/RTClib.o: $(RTC) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/RTClib.o $(RTC) +$(BIN)/libRTClib.so: $(RTC) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libRTClib.so $(RTC) KEYPAD=$(LIBRARIES)/Keypad/src/Key.cpp \ $(LIBRARIES)/Keypad/src/Keypad.cpp \ $(LIBRARIES)/Keypad/src/Keypad_CI.cpp -$(BIN)/Keypad.o: $(KEYPAD) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad.o $(KEYPAD) +$(BIN)/libKeypad.so: $(KEYPAD) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libKeypad.so $(KEYPAD) SDFAT=$(LIBRARIES)/SdFat/src/FreeStack.cpp \ $(LIBRARIES)/SdFat/src/MinimumSerial.cpp \ @@ -328,5 +344,10 @@ SDFAT=$(LIBRARIES)/SdFat/src/FreeStack.cpp \ $(LIBRARIES)/SdFat/src/iostream/StreamBaseClass.cpp \ $(LIBRARIES)/SdFat/src/iostream/istream.cpp \ $(LIBRARIES)/SdFat/src/iostream/ostream.cpp -$(BIN)/SdFat.o: $(SDFAT) - g++ $(FLAGS) $(INCLUDE) -o $(BIN)/SdFat.o $(SDFAT) +$(BIN)/libSdFat.so: $(SDFAT) + g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ + $(INCLUDE) -o $(BIN)/libSdFat.so $(SDFAT) + +.PHONY: clean +clean: + rm -rf $(BIN)/* From d93608d8ab2cb8bbd5ef76a550d11f5362dd850b Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 17 Jul 2023 16:03:14 -0700 Subject: [PATCH 3/8] Works for BlinkTest.cpp! --- Makefile | 367 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 253 insertions(+), 114 deletions(-) diff --git a/Makefile b/Makefile index 788f0744b..51b7a0a0c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ TEST=$(LIBRARIES)/TankController/test BIN=$(LIBRARIES)/TankController/.arduino_ci FLAGS=-std=c++0x \ - -Wno-deprecated-declarations \ + -Wno-deprecated-declarations \ -DARDUINO=100 \ -g \ -O1 \ @@ -48,14 +48,30 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \ all : $(BIN)/BlinkTest.cpp.bin -LIBS_SO=$(BIN)/libBusIO.so $(BIN)/libMAX31865.so $(BIN)/libPID.so $(BIN)/libEthernet.so \ - $(BIN)/libLiquidCrystal.so $(BIN)/libRTClib.so $(BIN)/libKeypad.so $(BIN)/libSdFat.so \ - $(BIN)/libarduino.so -LIBS=-lBusIO -lMAX31865 -lPID -lEthernet -lLiquidCrystal -lRTClib -lKeypad -lSdFat -larduino GPP_TEST=g++ $(FLAGS) -L$(LIBRARIES)/TankController/.arduino_ci $(INCLUDE) -$(BIN)/BlinkTest.cpp.bin: $(LIBS_SO) $(TEST)/BlinkTest.cpp - $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp $(LIBS) +$(BIN)/BlinkTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/BlinkTest.cpp + $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp $(LIBS) -larduino + +BUSIO=$(BIN)/BusIO.o $(BIN)/I2CDevice.o $(BIN)/SPIDevice.o +ETHERNET=$(BIN)/Dhcp.o $(BIN)/Dns.o $(BIN)/Ethernet.o $(BIN)/EthernetClient.o $(BIN)/EthernetClient_CI.o \ +$(BIN)/EthernetServer.o $(BIN)/EthernetServer_CI.o $(BIN)/EthernetUdp.o $(BIN)/Ethernet_CI.o \ +$(BIN)/socket.o $(BIN)/w5100.o +LCD=$(BIN)/LiquidCrystal.o $(BIN)/LiquidCrystal_CI.o +MAX31865=$(BIN)/MAX31865.o $(BIN)/MAX31865_CI.o +RTC=$(BIN)/RTC_DS1307.o $(BIN)/RTC_DS3231.o $(BIN)/RTC_Micros.o $(BIN)/RTC_Millis.o \ + $(BIN)/RTC_PCF8523.o $(BIN)/RTC_PCF8563.o $(BIN)/RTClib.o $(BIN)/RTClib_CI.o +KEYPAD=$(BIN)/Key.o $(BIN)/Keypad.o $(BIN)/Keypad_CI.o +SDFAT=$(BIN)/FreeStack.o $(BIN)/MinimumSerial.o $(BIN)/File_CI.o $(BIN)/SD_CI.o $(BIN)/ExFatDbg.o \ + $(BIN)/ExFatFile.o $(BIN)/ExFatFilePrint.o $(BIN)/ExFatFileWrite.o $(BIN)/ExFatFormatter.o \ + $(BIN)/ExFatName.o $(BIN)/ExFatPartition.o $(BIN)/ExFatVolume.o $(BIN)/FatDbg.o $(BIN)/FatFile.o \ + $(BIN)/FatFormatter.o $(BIN)/FatName.o $(BIN)/FatPartition.o $(BIN)/FatVolume.o $(BIN)/FsFile.o \ + $(BIN)/FsNew.o $(BIN)/FsVolume.o $(BIN)/SdCardInfo.o $(BIN)/SdSpiCard.o $(BIN)/SdioTeensy.o \ + $(BIN)/SdSpiArtemis.o $(BIN)/SdSpiChipSelect.o $(BIN)/SdSpiDue.o $(BIN)/SdSpiESP.o $(BIN)/FatFileSFN.o \ + $(BIN)/SdSpiParticle.o $(BIN)/SdSpiSTM32.o $(BIN)/SdSpiSTM32Core.o $(BIN)/SdSpiTeensy3.o \ + $(BIN)/FmtNumber.o $(BIN)/FsCache.o $(BIN)/FsDateTime.o $(BIN)/FsName.o $(BIN)/FsStructs.o \ + $(BIN)/FsUtf.o $(BIN)/PrintBasic.o $(BIN)/upcase.o $(BIN)/StdioStream.o $(BIN)/StreamBaseClass.o \ + $(BIN)/istream.o $(BIN)/ostream.o OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTests.o \ $(BIN)/TC_util.o $(BIN)/TankController.o $(BIN)/DataLogger_TC.o $(BIN)/DateTime_TC.o \ @@ -70,10 +86,12 @@ OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTest $(BIN)/SetChillOrHeat.o $(BIN)/SetGoogleSheetInterval.o $(BIN)/SetKD.o $(BIN)/SetKI.o \ $(BIN)/SetKP.o $(BIN)/SetPHCalibClear.o $(BIN)/SetPHSetPoint.o $(BIN)/SetPHWithSine.o \ $(BIN)/SetTankID.o $(BIN)/SetTempCalibClear.o $(BIN)/SetTempSetPoint.o $(BIN)/SetTempWithSine.o \ - $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o -$(BIN)/libarduino.so: $(OBJECTS) + $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o \ + $(BUSIO) $(LCD) $(MAX31865) $(BIN)/PID.o $(ETHERNET) $(RTC) $(KEYPAD) $(SDFAT) + +$(BIN)/libarduino.so: $(OBJECTS) $(LIBS_SO) g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(LIBRARIES)/TankController/.arduino_ci \ - $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) + $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) $(LIBS) $(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp @@ -243,110 +261,231 @@ $(BIN)/UIState.o: $(SRC)/UIState/UIState.cpp $(BIN)/Wait.o: $(SRC)/UIState/Wait.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Wait.o $(SRC)/UIState/Wait.cpp -BUSIO=$(LIBRARIES)/Adafruit_BusIO/src/Adafruit_BusIO_Register.cpp \ - $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_I2CDevice.cpp \ - $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_SPIDevice.cpp -$(BIN)/libBusIO.so: $(BUSIO) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libBusIO.so $(BUSIO) - -MAX31865=$(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865.cpp \ - $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865_CI.cpp -$(BIN)/libMAX31865.so: $(MAX31865) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libMAX31865.so $(MAX31865) - -$(BIN)/libPID.so: $(LIBRARIES)/PID/src/PID_v1.cpp - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libPID.so $(LIBRARIES)/PID/src/PID_v1.cpp - -ETHERNET=$(LIBRARIES)/Ethernet/src/Dhcp.cpp \ - $(LIBRARIES)/Ethernet/src/Dns.cpp \ - $(LIBRARIES)/Ethernet/src/Ethernet.cpp \ - $(LIBRARIES)/Ethernet/src/EthernetClient.cpp \ - $(LIBRARIES)/Ethernet/src/EthernetClient_CI.cpp \ - $(LIBRARIES)/Ethernet/src/EthernetServer.cpp \ - $(LIBRARIES)/Ethernet/src/EthernetServer_CI.cpp \ - $(LIBRARIES)/Ethernet/src/EthernetUdp.cpp \ - $(LIBRARIES)/Ethernet/src/Ethernet_CI.cpp \ - $(LIBRARIES)/Ethernet/src/socket.cpp \ - $(LIBRARIES)/Ethernet/src/utility/w5100.cpp -$(BIN)/libEthernet.so: $(ETHERNET) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libEthernet.so $(ETHERNET) - -LCD=$(LIBRARIES)/LiquidCrystal/src/LiquidCrystal.cpp \ - $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal_CI.cpp -$(BIN)/libLiquidCrystal.so: $(LCD) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libLiquidCrystal.so $(LCD) - -RTC=$(LIBRARIES)/RTClib/src/RTC_DS1307.cpp \ - $(LIBRARIES)/RTClib/src/RTC_DS3231.cpp \ - $(LIBRARIES)/RTClib/src/RTC_Micros.cpp \ - $(LIBRARIES)/RTClib/src/RTC_Millis.cpp \ - $(LIBRARIES)/RTClib/src/RTC_PCF8523.cpp \ - $(LIBRARIES)/RTClib/src/RTC_PCF8563.cpp \ - $(LIBRARIES)/RTClib/src/RTClib.cpp \ - $(LIBRARIES)/RTClib/src/RTClib_CI.cpp -$(BIN)/libRTClib.so: $(RTC) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libRTClib.so $(RTC) - -KEYPAD=$(LIBRARIES)/Keypad/src/Key.cpp \ - $(LIBRARIES)/Keypad/src/Keypad.cpp \ - $(LIBRARIES)/Keypad/src/Keypad_CI.cpp -$(BIN)/libKeypad.so: $(KEYPAD) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libKeypad.so $(KEYPAD) - -SDFAT=$(LIBRARIES)/SdFat/src/FreeStack.cpp \ - $(LIBRARIES)/SdFat/src/MinimumSerial.cpp \ - $(LIBRARIES)/SdFat/src/ArduinoCI/File_CI.cpp \ - $(LIBRARIES)/SdFat/src/ArduinoCI/SD_CI.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatDbg.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFile.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFilePrint.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFileWrite.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFormatter.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatName.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatPartition.cpp \ - $(LIBRARIES)/SdFat/src/ExFatLib/ExFatVolume.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatDbg.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatFormatter.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatName.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatPartition.cpp \ - $(LIBRARIES)/SdFat/src/FatLib/FatVolume.cpp \ - $(LIBRARIES)/SdFat/src/FsLib/FsFile.cpp \ - $(LIBRARIES)/SdFat/src/FsLib/FsNew.cpp \ - $(LIBRARIES)/SdFat/src/FsLib/FsVolume.cpp \ - $(LIBRARIES)/SdFat/src/SdCard/SdCardInfo.cpp \ - $(LIBRARIES)/SdFat/src/SdCard/SdSpiCard.cpp \ - $(LIBRARIES)/SdFat/src/SdCard/SdioTeensy.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiArtemis.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiChipSelect.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiDue.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiESP.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiParticle.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32Core.cpp \ - $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiTeensy3.cpp \ - $(LIBRARIES)/SdFat/src/common/FmtNumber.cpp \ - $(LIBRARIES)/SdFat/src/common/FsCache.cpp \ - $(LIBRARIES)/SdFat/src/common/FsDateTime.cpp \ - $(LIBRARIES)/SdFat/src/common/FsName.cpp \ - $(LIBRARIES)/SdFat/src/common/FsStructs.cpp \ - $(LIBRARIES)/SdFat/src/common/FsUtf.cpp \ - $(LIBRARIES)/SdFat/src/common/PrintBasic.cpp \ - $(LIBRARIES)/SdFat/src/common/upcase.cpp \ - $(LIBRARIES)/SdFat/src/iostream/StdioStream.cpp \ - $(LIBRARIES)/SdFat/src/iostream/StreamBaseClass.cpp \ - $(LIBRARIES)/SdFat/src/iostream/istream.cpp \ - $(LIBRARIES)/SdFat/src/iostream/ostream.cpp -$(BIN)/libSdFat.so: $(SDFAT) - g++ -$(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup \ - $(INCLUDE) -o $(BIN)/libSdFat.so $(SDFAT) +$(BIN)/BusIO.o: $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_BusIO_Register.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/BusIO.o $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_BusIO_Register.cpp + +$(BIN)/I2CDevice.o: $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_I2CDevice.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/I2CDevice.o $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_I2CDevice.cpp + +$(BIN)/SPIDevice.o: $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_SPIDevice.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SPIDevice.o $(LIBRARIES)/Adafruit_BusIO/src/Adafruit_SPIDevice.cpp + +$(BIN)/MAX31865.o: $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/MAX31865.o $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865.cpp + +$(BIN)/MAX31865_CI.o: $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/MAX31865_CI.o $(LIBRARIES)/Adafruit_MAX31865_library/src/Adafruit_MAX31865_CI.cpp + +$(BIN)/PID.o: $(LIBRARIES)/PID/src/PID_v1.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PID.o $(LIBRARIES)/PID/src/PID_v1.cpp + +$(BIN)/Dhcp.o: $(LIBRARIES)/Ethernet/src/Dhcp.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Dhcp.o $(LIBRARIES)/Ethernet/src/Dhcp.cpp + +$(BIN)/Dns.o: $(LIBRARIES)/Ethernet/src/Dns.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Dns.o $(LIBRARIES)/Ethernet/src/Dns.cpp + +$(BIN)/Ethernet.o: $(LIBRARIES)/Ethernet/src/Ethernet.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet.o $(LIBRARIES)/Ethernet/src/Ethernet.cpp + +$(BIN)/EthernetClient.o: $(LIBRARIES)/Ethernet/src/EthernetClient.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetClient.o $(LIBRARIES)/Ethernet/src/EthernetClient.cpp + +$(BIN)/EthernetClient_CI.o: $(LIBRARIES)/Ethernet/src/EthernetClient_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetClient_CI.o $(LIBRARIES)/Ethernet/src/EthernetClient_CI.cpp + +$(BIN)/EthernetServer.o: $(LIBRARIES)/Ethernet/src/EthernetServer.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetServer.o $(LIBRARIES)/Ethernet/src/EthernetServer.cpp + +$(BIN)/EthernetServer_CI.o: $(LIBRARIES)/Ethernet/src/EthernetServer_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetServer_CI.o $(LIBRARIES)/Ethernet/src/EthernetServer_CI.cpp + +$(BIN)/EthernetUdp.o: $(LIBRARIES)/Ethernet/src/EthernetUdp.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/EthernetUdp.o $(LIBRARIES)/Ethernet/src/EthernetUdp.cpp + +$(BIN)/Ethernet_CI.o: $(LIBRARIES)/Ethernet/src/Ethernet_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Ethernet_CI.o $(LIBRARIES)/Ethernet/src/Ethernet_CI.cpp + +$(BIN)/socket.o: $(LIBRARIES)/Ethernet/src/socket.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/socket.o $(LIBRARIES)/Ethernet/src/socket.cpp + +$(BIN)/w5100.o: $(LIBRARIES)/Ethernet/src/utility/w5100.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/w5100.o $(LIBRARIES)/Ethernet/src/utility/w5100.cpp + +$(BIN)/LiquidCrystal.o: $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal.o $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal.cpp + +$(BIN)/LiquidCrystal_CI.o: $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/LiquidCrystal_CI.o $(LIBRARIES)/LiquidCrystal/src/LiquidCrystal_CI.cpp + +$(BIN)/RTC_DS1307.o: $(LIBRARIES)/RTClib/src/RTC_DS1307.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_DS1307.o $(LIBRARIES)/RTClib/src/RTC_DS1307.cpp + +$(BIN)/RTC_DS3231.o: $(LIBRARIES)/RTClib/src/RTC_DS3231.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_DS3231.o $(LIBRARIES)/RTClib/src/RTC_DS3231.cpp + +$(BIN)/RTC_Micros.o: $(LIBRARIES)/RTClib/src/RTC_Micros.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_Micros.o $(LIBRARIES)/RTClib/src/RTC_Micros.cpp + +$(BIN)/RTC_Millis.o: $(LIBRARIES)/RTClib/src/RTC_Millis.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_Millis.o $(LIBRARIES)/RTClib/src/RTC_Millis.cpp + +$(BIN)/RTC_PCF8523.o: $(LIBRARIES)/RTClib/src/RTC_PCF8523.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_PCF8523.o $(LIBRARIES)/RTClib/src/RTC_PCF8523.cpp + +$(BIN)/RTC_PCF8563.o: $(LIBRARIES)/RTClib/src/RTC_PCF8563.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTC_PCF8563.o $(LIBRARIES)/RTClib/src/RTC_PCF8563.cpp + +$(BIN)/RTClib.o: $(LIBRARIES)/RTClib/src/RTClib.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTClib.o $(LIBRARIES)/RTClib/src/RTClib.cpp + +$(BIN)/RTClib_CI.o: $(LIBRARIES)/RTClib/src/RTClib_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RTClib_CI.o $(LIBRARIES)/RTClib/src/RTClib_CI.cpp + +$(BIN)/Key.o: $(LIBRARIES)/Keypad/src/Key.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Key.o $(LIBRARIES)/Keypad/src/Key.cpp + +$(BIN)/Keypad.o: $(LIBRARIES)/Keypad/src/Keypad.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad.o $(LIBRARIES)/Keypad/src/Keypad.cpp + +$(BIN)/Keypad_CI.o: $(LIBRARIES)/Keypad/src/Keypad_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Keypad_CI.o $(LIBRARIES)/Keypad/src/Keypad_CI.cpp + + +$(BIN)/FreeStack.o: $(LIBRARIES)/SdFat/src/FreeStack.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FreeStack.o $(LIBRARIES)/SdFat/src/FreeStack.cpp + +$(BIN)/MinimumSerial.o: $(LIBRARIES)/SdFat/src/MinimumSerial.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/MinimumSerial.o $(LIBRARIES)/SdFat/src/MinimumSerial.cpp + +$(BIN)/File_CI.o: $(LIBRARIES)/SdFat/src/ArduinoCI/File_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/File_CI.o $(LIBRARIES)/SdFat/src/ArduinoCI/File_CI.cpp + +$(BIN)/SD_CI.o: $(LIBRARIES)/SdFat/src/ArduinoCI/SD_CI.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SD_CI.o $(LIBRARIES)/SdFat/src/ArduinoCI/SD_CI.cpp + +$(BIN)/ExFatDbg.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatDbg.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatDbg.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatDbg.cpp + +$(BIN)/ExFatFile.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFile.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatFile.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFile.cpp + +$(BIN)/ExFatFilePrint.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFilePrint.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatFilePrint.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFilePrint.cpp + +$(BIN)/ExFatFileWrite.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFileWrite.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatFileWrite.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFileWrite.cpp + +$(BIN)/ExFatFormatter.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFormatter.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatFormatter.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatFormatter.cpp + +$(BIN)/ExFatName.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatName.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatName.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatName.cpp + +$(BIN)/ExFatPartition.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatPartition.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatPartition.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatPartition.cpp + +$(BIN)/ExFatVolume.o: $(LIBRARIES)/SdFat/src/ExFatLib/ExFatVolume.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ExFatVolume.o $(LIBRARIES)/SdFat/src/ExFatLib/ExFatVolume.cpp + +$(BIN)/FatDbg.o: $(LIBRARIES)/SdFat/src/FatLib/FatDbg.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatDbg.o $(LIBRARIES)/SdFat/src/FatLib/FatDbg.cpp + +$(BIN)/FatFile.o: $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFile.o $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp + +$(BIN)/FatFileSFN.o: $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFileSFN.o $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp + +$(BIN)/FatFormatter.o: $(LIBRARIES)/SdFat/src/FatLib/FatFormatter.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFormatter.o $(LIBRARIES)/SdFat/src/FatLib/FatFormatter.cpp + +$(BIN)/FatName.o: $(LIBRARIES)/SdFat/src/FatLib/FatName.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatName.o $(LIBRARIES)/SdFat/src/FatLib/FatName.cpp + +$(BIN)/FatPartition.o: $(LIBRARIES)/SdFat/src/FatLib/FatPartition.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatPartition.o $(LIBRARIES)/SdFat/src/FatLib/FatPartition.cpp + +$(BIN)/FatVolume.o: $(LIBRARIES)/SdFat/src/FatLib/FatVolume.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatVolume.o $(LIBRARIES)/SdFat/src/FatLib/FatVolume.cpp + +$(BIN)/FsFile.o: $(LIBRARIES)/SdFat/src/FsLib/FsFile.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsFile.o $(LIBRARIES)/SdFat/src/FsLib/FsFile.cpp + +$(BIN)/FsNew.o: $(LIBRARIES)/SdFat/src/FsLib/FsNew.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsNew.o $(LIBRARIES)/SdFat/src/FsLib/FsNew.cpp + +$(BIN)/FsVolume.o: $(LIBRARIES)/SdFat/src/FsLib/FsVolume.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsVolume.o $(LIBRARIES)/SdFat/src/FsLib/FsVolume.cpp + +$(BIN)/SdCardInfo.o: $(LIBRARIES)/SdFat/src/SdCard/SdCardInfo.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdCardInfo.o $(LIBRARIES)/SdFat/src/SdCard/SdCardInfo.cpp + +$(BIN)/SdSpiCard.o: $(LIBRARIES)/SdFat/src/SdCard/SdSpiCard.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiCard.o $(LIBRARIES)/SdFat/src/SdCard/SdSpiCard.cpp + +$(BIN)/SdioTeensy.o: $(LIBRARIES)/SdFat/src/SdCard/SdioTeensy.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdioTeensy.o $(LIBRARIES)/SdFat/src/SdCard/SdioTeensy.cpp + +$(BIN)/SdSpiArtemis.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiArtemis.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiArtemis.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiArtemis.cpp + +$(BIN)/SdSpiChipSelect.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiChipSelect.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiChipSelect.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiChipSelect.cpp + +$(BIN)/SdSpiDue.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiDue.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiDue.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiDue.cpp + +$(BIN)/SdSpiESP.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiESP.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiESP.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiESP.cpp + +$(BIN)/SdSpiParticle.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiParticle.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiParticle.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiParticle.cpp + +$(BIN)/SdSpiSTM32.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiSTM32.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32.cpp + +$(BIN)/SdSpiSTM32Core.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32Core.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiSTM32Core.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiSTM32Core.cpp + +$(BIN)/SdSpiTeensy3.o: $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiTeensy3.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SdSpiTeensy3.o $(LIBRARIES)/SdFat/src/SpiDriver/SdSpiTeensy3.cpp + +$(BIN)/FmtNumber.o: $(LIBRARIES)/SdFat/src/common/FmtNumber.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FmtNumber.o $(LIBRARIES)/SdFat/src/common/FmtNumber.cpp + +$(BIN)/FsCache.o: $(LIBRARIES)/SdFat/src/common/FsCache.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsCache.o $(LIBRARIES)/SdFat/src/common/FsCache.cpp + +$(BIN)/FsDateTime.o: $(LIBRARIES)/SdFat/src/common/FsDateTime.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsDateTime.o $(LIBRARIES)/SdFat/src/common/FsDateTime.cpp + +$(BIN)/FsName.o: $(LIBRARIES)/SdFat/src/common/FsName.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsName.o $(LIBRARIES)/SdFat/src/common/FsName.cpp + +$(BIN)/FsStructs.o: $(LIBRARIES)/SdFat/src/common/FsStructs.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsStructs.o $(LIBRARIES)/SdFat/src/common/FsStructs.cpp + +$(BIN)/FsUtf.o: $(LIBRARIES)/SdFat/src/common/FsUtf.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FsUtf.o $(LIBRARIES)/SdFat/src/common/FsUtf.cpp + +$(BIN)/PrintBasic.o: $(LIBRARIES)/SdFat/src/common/PrintBasic.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/PrintBasic.o $(LIBRARIES)/SdFat/src/common/PrintBasic.cpp + +$(BIN)/upcase.o: $(LIBRARIES)/SdFat/src/common/upcase.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/upcase.o $(LIBRARIES)/SdFat/src/common/upcase.cpp + +$(BIN)/StdioStream.o: $(LIBRARIES)/SdFat/src/iostream/StdioStream.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/StdioStream.o $(LIBRARIES)/SdFat/src/iostream/StdioStream.cpp + +$(BIN)/StreamBaseClass.o: $(LIBRARIES)/SdFat/src/iostream/StreamBaseClass.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/StreamBaseClass.o $(LIBRARIES)/SdFat/src/iostream/StreamBaseClass.cpp + +$(BIN)/istream.o: $(LIBRARIES)/SdFat/src/iostream/istream.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/istream.o $(LIBRARIES)/SdFat/src/iostream/istream.cpp + +$(BIN)/ostream.o: $(LIBRARIES)/SdFat/src/iostream/ostream.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ostream.o $(LIBRARIES)/SdFat/src/iostream/ostream.cpp .PHONY: clean clean: From 5823839c6e6e1ddafff591233ef64dabf94ff334 Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 17 Jul 2023 16:36:31 -0700 Subject: [PATCH 4/8] With the Makefile, repeating tests takes 11 seconds instead of 3 min 17 sec. Changes to a test take about 15 seconds and changes to a source file take about 25 seconds to run all the tests. --- Makefile | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 51b7a0a0c..2c42ca437 100644 --- a/Makefile +++ b/Makefile @@ -45,14 +45,173 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \ -I$(LIBRARIES)/SdFat/src/iostream .PHONY : all -all : $(BIN)/BlinkTest.cpp.bin - +all : $(BIN)/BlinkTest.cpp.bin $(BIN)/DateTimeTest.cpp.bin $(BIN)/EEPROMTest.cpp.bin \ + $(BIN)/EnablePIDTest.cpp.bin $(BIN)/EthernetServerTest.cpp.bin $(BIN)/EthernetTest.cpp.bin \ + $(BIN)/JSONBuilderTest.cpp.bin $(BIN)/KeypadTest.cpp.bin $(BIN)/LiquidCrystalTest.cpp.bin \ + $(BIN)/MenuTest.cpp.bin $(BIN)/NumberCollectorStateTest.cpp.bin $(BIN)/PHCalibrationHighTest.cpp.bin \ + $(BIN)/PHCalibrationLowTest.cpp.bin $(BIN)/PHCalibrationMidTest.cpp.bin $(BIN)/PHControlTest.cpp.bin \ + $(BIN)/PHProbeTest.cpp.bin $(BIN)/PIDTest.cpp.bin $(BIN)/PushingBoxTest.cpp.bin $(BIN)/SDTest.cpp.bin \ + $(BIN)/SeeDeviceAddressTest.cpp.bin $(BIN)/SeeDeviceUptimeTest.cpp.bin $(BIN)/SeeFreeMemoryTest.cpp.bin \ + $(BIN)/SeeGoogleMinsTest.cpp.bin $(BIN)/SeeLogFileTest.cpp.bin $(BIN)/SeePHSlopeTest.cpp.bin \ + $(BIN)/SeePIDConstantsTest.cpp.bin $(BIN)/SeePhTest.cpp.bin $(BIN)/SeeTankIDTest.cpp.bin \ + $(BIN)/SeeTempCalOffsetTest.cpp.bin $(BIN)/SeeVersionTest.cpp.bin $(BIN)/SerialTest.cpp.bin \ + $(BIN)/SetChillOrHeatTest.cpp.bin $(BIN)/SetGoogleSheetIntervalTest.cpp.bin $(BIN)/SetKDTest.cpp.bin \ + $(BIN)/SetKITest.cpp.bin $(BIN)/SetKPTest.cpp.bin $(BIN)/SetPHCalibClearTest.cpp.bin \ + $(BIN)/SetPHSetPointTest.cpp.bin $(BIN)/SetPHWithSineTest.cpp.bin $(BIN)/SetTankIDTest.cpp.bin \ + $(BIN)/SetTempCalibClearTest.cpp.bin $(BIN)/SetTempSetPointTest.cpp.bin $(BIN)/SetTempWithSineTest.cpp.bin \ + $(BIN)/SetTimeTest.cpp.bin $(BIN)/StringsTest.cpp.bin $(BIN)/TCLibTest.cpp.bin \ + $(BIN)/TempProbe_TCTest.cpp.bin $(BIN)/TemperatureCalibrationTest.cpp.bin \ + $(BIN)/TemperatureControlTest.cpp.bin $(BIN) GPP_TEST=g++ $(FLAGS) -L$(LIBRARIES)/TankController/.arduino_ci $(INCLUDE) $(BIN)/BlinkTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/BlinkTest.cpp $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp $(LIBS) -larduino +$(BIN)/DateTimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/DateTimeTest.cpp + $(GPP_TEST) -o $(BIN)/DateTimeTest.cpp.bin $(TEST)/DateTimeTest.cpp $(LIBS) -larduino + +$(BIN)/EEPROMTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EEPROMTest.cpp + $(GPP_TEST) -o $(BIN)/EEPROMTest.cpp.bin $(TEST)/EEPROMTest.cpp $(LIBS) -larduino + +$(BIN)/EnablePIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EnablePIDTest.cpp + $(GPP_TEST) -o $(BIN)/EnablePIDTest.cpp.bin $(TEST)/EnablePIDTest.cpp $(LIBS) -larduino + +$(BIN)/EthernetServerTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EthernetServerTest.cpp + $(GPP_TEST) -o $(BIN)/EthernetServerTest.cpp.bin $(TEST)/EthernetServerTest.cpp $(LIBS) -larduino + +$(BIN)/EthernetTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EthernetTest.cpp + $(GPP_TEST) -o $(BIN)/EthernetTest.cpp.bin $(TEST)/EthernetTest.cpp $(LIBS) -larduino + +$(BIN)/JSONBuilderTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/JSONBuilderTest.cpp + $(GPP_TEST) -o $(BIN)/JSONBuilderTest.cpp.bin $(TEST)/JSONBuilderTest.cpp $(LIBS) -larduino + +$(BIN)/KeypadTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/KeypadTest.cpp + $(GPP_TEST) -o $(BIN)/KeypadTest.cpp.bin $(TEST)/KeypadTest.cpp $(LIBS) -larduino + +$(BIN)/LiquidCrystalTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/LiquidCrystalTest.cpp + $(GPP_TEST) -o $(BIN)/LiquidCrystalTest.cpp.bin $(TEST)/LiquidCrystalTest.cpp $(LIBS) -larduino + +$(BIN)/MenuTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/MenuTest.cpp + $(GPP_TEST) -o $(BIN)/MenuTest.cpp.bin $(TEST)/MenuTest.cpp $(LIBS) -larduino + +$(BIN)/NumberCollectorStateTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/NumberCollectorStateTest.cpp + $(GPP_TEST) -o $(BIN)/NumberCollectorStateTest.cpp.bin $(TEST)/NumberCollectorStateTest.cpp $(LIBS) -larduino + +$(BIN)/PHCalibrationHighTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationHighTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationHighTest.cpp.bin $(TEST)/PHCalibrationHighTest.cpp $(LIBS) -larduino + +$(BIN)/PHCalibrationLowTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationLowTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationLowTest.cpp.bin $(TEST)/PHCalibrationLowTest.cpp $(LIBS) -larduino + +$(BIN)/PHCalibrationMidTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationMidTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationMidTest.cpp.bin $(TEST)/PHCalibrationMidTest.cpp $(LIBS) -larduino + +$(BIN)/PHControlTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHControlTest.cpp + $(GPP_TEST) -o $(BIN)/PHControlTest.cpp.bin $(TEST)/PHControlTest.cpp $(LIBS) -larduino + +$(BIN)/PHProbeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHProbeTest.cpp + $(GPP_TEST) -o $(BIN)/PHProbeTest.cpp.bin $(TEST)/PHProbeTest.cpp $(LIBS) -larduino + +$(BIN)/PIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PIDTest.cpp + $(GPP_TEST) -o $(BIN)/PIDTest.cpp.bin $(TEST)/PIDTest.cpp $(LIBS) -larduino + +$(BIN)/PushingBoxTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PushingBoxTest.cpp + $(GPP_TEST) -o $(BIN)/PushingBoxTest.cpp.bin $(TEST)/PushingBoxTest.cpp $(LIBS) -larduino + +$(BIN)/SDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SDTest.cpp + $(GPP_TEST) -o $(BIN)/SDTest.cpp.bin $(TEST)/SDTest.cpp $(LIBS) -larduino + +$(BIN)/SeeDeviceAddressTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeDeviceAddressTest.cpp + $(GPP_TEST) -o $(BIN)/SeeDeviceAddressTest.cpp.bin $(TEST)/SeeDeviceAddressTest.cpp $(LIBS) -larduino + +$(BIN)/SeeDeviceUptimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeDeviceUptimeTest.cpp + $(GPP_TEST) -o $(BIN)/SeeDeviceUptimeTest.cpp.bin $(TEST)/SeeDeviceUptimeTest.cpp $(LIBS) -larduino + +$(BIN)/SeeFreeMemoryTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeFreeMemoryTest.cpp + $(GPP_TEST) -o $(BIN)/SeeFreeMemoryTest.cpp.bin $(TEST)/SeeFreeMemoryTest.cpp $(LIBS) -larduino + +$(BIN)/SeeGoogleMinsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeGoogleMinsTest.cpp + $(GPP_TEST) -o $(BIN)/SeeGoogleMinsTest.cpp.bin $(TEST)/SeeGoogleMinsTest.cpp $(LIBS) -larduino + +$(BIN)/SeeLogFileTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeLogFileTest.cpp + $(GPP_TEST) -o $(BIN)/SeeLogFileTest.cpp.bin $(TEST)/SeeLogFileTest.cpp $(LIBS) -larduino + +$(BIN)/SeePHSlopeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePHSlopeTest.cpp + $(GPP_TEST) -o $(BIN)/SeePHSlopeTest.cpp.bin $(TEST)/SeePHSlopeTest.cpp $(LIBS) -larduino + +$(BIN)/SeePIDConstantsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePIDConstantsTest.cpp + $(GPP_TEST) -o $(BIN)/SeePIDConstantsTest.cpp.bin $(TEST)/SeePIDConstantsTest.cpp $(LIBS) -larduino + +$(BIN)/SeePhTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePhTest.cpp + $(GPP_TEST) -o $(BIN)/SeePhTest.cpp.bin $(TEST)/SeePhTest.cpp $(LIBS) -larduino + +$(BIN)/SeeTankIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeTankIDTest.cpp + $(GPP_TEST) -o $(BIN)/SeeTankIDTest.cpp.bin $(TEST)/SeeTankIDTest.cpp $(LIBS) -larduino + +$(BIN)/SeeTempCalOffsetTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeTempCalOffsetTest.cpp + $(GPP_TEST) -o $(BIN)/SeeTempCalOffsetTest.cpp.bin $(TEST)/SeeTempCalOffsetTest.cpp $(LIBS) -larduino + +$(BIN)/SeeVersionTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeVersionTest.cpp + $(GPP_TEST) -o $(BIN)/SeeVersionTest.cpp.bin $(TEST)/SeeVersionTest.cpp $(LIBS) -larduino + +$(BIN)/SerialTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SerialTest.cpp + $(GPP_TEST) -o $(BIN)/SerialTest.cpp.bin $(TEST)/SerialTest.cpp $(LIBS) -larduino + +$(BIN)/SetChillOrHeatTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetChillOrHeatTest.cpp + $(GPP_TEST) -o $(BIN)/SetChillOrHeatTest.cpp.bin $(TEST)/SetChillOrHeatTest.cpp $(LIBS) -larduino + +$(BIN)/SetGoogleSheetIntervalTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetGoogleSheetIntervalTest.cpp + $(GPP_TEST) -o $(BIN)/SetGoogleSheetIntervalTest.cpp.bin $(TEST)/SetGoogleSheetIntervalTest.cpp $(LIBS) -larduino + +$(BIN)/SetKDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKDTest.cpp + $(GPP_TEST) -o $(BIN)/SetKDTest.cpp.bin $(TEST)/SetKDTest.cpp $(LIBS) -larduino + +$(BIN)/SetKITest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKITest.cpp + $(GPP_TEST) -o $(BIN)/SetKITest.cpp.bin $(TEST)/SetKITest.cpp $(LIBS) -larduino + +$(BIN)/SetKPTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKPTest.cpp + $(GPP_TEST) -o $(BIN)/SetKPTest.cpp.bin $(TEST)/SetKPTest.cpp $(LIBS) -larduino + +$(BIN)/SetPHCalibClearTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHCalibClearTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHCalibClearTest.cpp.bin $(TEST)/SetPHCalibClearTest.cpp $(LIBS) -larduino + +$(BIN)/SetPHSetPointTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHSetPointTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHSetPointTest.cpp.bin $(TEST)/SetPHSetPointTest.cpp $(LIBS) -larduino + +$(BIN)/SetPHWithSineTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHWithSineTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHWithSineTest.cpp.bin $(TEST)/SetPHWithSineTest.cpp $(LIBS) -larduino + +$(BIN)/SetTankIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTankIDTest.cpp + $(GPP_TEST) -o $(BIN)/SetTankIDTest.cpp.bin $(TEST)/SetTankIDTest.cpp $(LIBS) -larduino + +$(BIN)/SetTempCalibClearTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempCalibClearTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempCalibClearTest.cpp.bin $(TEST)/SetTempCalibClearTest.cpp $(LIBS) -larduino + +$(BIN)/SetTempSetPointTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempSetPointTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempSetPointTest.cpp.bin $(TEST)/SetTempSetPointTest.cpp $(LIBS) -larduino + +$(BIN)/SetTempWithSineTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempWithSineTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempWithSineTest.cpp.bin $(TEST)/SetTempWithSineTest.cpp $(LIBS) -larduino + +$(BIN)/SetTimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTimeTest.cpp + $(GPP_TEST) -o $(BIN)/SetTimeTest.cpp.bin $(TEST)/SetTimeTest.cpp $(LIBS) -larduino + +$(BIN)/StringsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/StringsTest.cpp + $(GPP_TEST) -o $(BIN)/StringsTest.cpp.bin $(TEST)/StringsTest.cpp $(LIBS) -larduino + +$(BIN)/TCLibTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TCLibTest.cpp + $(GPP_TEST) -o $(BIN)/TCLibTest.cpp.bin $(TEST)/TCLibTest.cpp $(LIBS) -larduino + +$(BIN)/TempProbe_TCTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TempProbe_TCTest.cpp + $(GPP_TEST) -o $(BIN)/TempProbe_TCTest.cpp.bin $(TEST)/TempProbe_TCTest.cpp $(LIBS) -larduino + +$(BIN)/TemperatureCalibrationTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TemperatureCalibrationTest.cpp + $(GPP_TEST) -o $(BIN)/TemperatureCalibrationTest.cpp.bin $(TEST)/TemperatureCalibrationTest.cpp $(LIBS) -larduino + +$(BIN)/TemperatureControlTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TemperatureControlTest.cpp + $(GPP_TEST) -o $(BIN)/TemperatureControlTest.cpp.bin $(TEST)/TemperatureControlTest.cpp $(LIBS) -larduino + BUSIO=$(BIN)/BusIO.o $(BIN)/I2CDevice.o $(BIN)/SPIDevice.o ETHERNET=$(BIN)/Dhcp.o $(BIN)/Dns.o $(BIN)/Ethernet.o $(BIN)/EthernetClient.o $(BIN)/EthernetClient_CI.o \ $(BIN)/EthernetServer.o $(BIN)/EthernetServer_CI.o $(BIN)/EthernetUdp.o $(BIN)/Ethernet_CI.o \ From ac184bee0ed3e71598c7023a2571d27c2a2085b9 Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 17 Jul 2023 20:41:45 -0700 Subject: [PATCH 5/8] Cleanup to match Arduino CI sample. --- Makefile | 232 +++++++++++++++++++++++++++---------------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/Makefile b/Makefile index 2c42ca437..76a9a6d59 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,23 @@ -LIBRARIES=/Users/jfoster/Documents/Arduino/libraries -ARDUINO_CI=$(LIBRARIES)/TankController/vendor/bundle/ruby/3.2.0/bundler/gems/arduino_ci-bc9c7e5b3bc3/cpp +LIBRARIES := $(shell bundle exec arduino_library_location.rb) SRC=$(LIBRARIES)/TankController/src TEST=$(LIBRARIES)/TankController/test BIN=$(LIBRARIES)/TankController/.arduino_ci FLAGS=-std=c++0x \ -Wno-deprecated-declarations \ - -DARDUINO=100 \ - -g \ - -O1 \ - -fno-omit-frame-pointer \ - -fno-optimize-sibling-calls \ - -fsanitize=address \ - -Wno-unknown-attributes \ - -Wno-address-of-packed-member \ - -D__AVR__ \ - -D__AVR_ATmega2560__ \ - -DARDUINO_ARCH_AVR \ - -DARDUINO_AVR_MEGA2560 + -DARDUINO=100 \ + -fPIC \ + -g \ + -O1 \ + -fno-omit-frame-pointer \ + -fno-optimize-sibling-calls \ + -fsanitize=address \ + -Wno-unknown-attributes \ + -Wno-address-of-packed-member \ + -D__AVR__ \ + -D__AVR_ATmega2560__ \ + -DARDUINO_ARCH_AVR \ + -DARDUINO_AVR_MEGA2560 INCLUDE=-I$(ARDUINO_CI)/arduino \ -I$(ARDUINO_CI)/unittest \ @@ -63,154 +63,154 @@ all : $(BIN)/BlinkTest.cpp.bin $(BIN)/DateTimeTest.cpp.bin $(BIN)/EEPROMTest.cpp $(BIN)/TempProbe_TCTest.cpp.bin $(BIN)/TemperatureCalibrationTest.cpp.bin \ $(BIN)/TemperatureControlTest.cpp.bin $(BIN) -GPP_TEST=g++ $(FLAGS) -L$(LIBRARIES)/TankController/.arduino_ci $(INCLUDE) +GPP_TEST=g++ $(FLAGS) -L$(BIN) $(INCLUDE) -$(BIN)/BlinkTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/BlinkTest.cpp - $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp $(LIBS) -larduino +$(BIN)/BlinkTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/BlinkTest.cpp + $(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp -larduino -$(BIN)/DateTimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/DateTimeTest.cpp - $(GPP_TEST) -o $(BIN)/DateTimeTest.cpp.bin $(TEST)/DateTimeTest.cpp $(LIBS) -larduino +$(BIN)/DateTimeTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/DateTimeTest.cpp + $(GPP_TEST) -o $(BIN)/DateTimeTest.cpp.bin $(TEST)/DateTimeTest.cpp -larduino -$(BIN)/EEPROMTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EEPROMTest.cpp - $(GPP_TEST) -o $(BIN)/EEPROMTest.cpp.bin $(TEST)/EEPROMTest.cpp $(LIBS) -larduino +$(BIN)/EEPROMTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/EEPROMTest.cpp + $(GPP_TEST) -o $(BIN)/EEPROMTest.cpp.bin $(TEST)/EEPROMTest.cpp -larduino -$(BIN)/EnablePIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EnablePIDTest.cpp - $(GPP_TEST) -o $(BIN)/EnablePIDTest.cpp.bin $(TEST)/EnablePIDTest.cpp $(LIBS) -larduino +$(BIN)/EnablePIDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/EnablePIDTest.cpp + $(GPP_TEST) -o $(BIN)/EnablePIDTest.cpp.bin $(TEST)/EnablePIDTest.cpp -larduino -$(BIN)/EthernetServerTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EthernetServerTest.cpp - $(GPP_TEST) -o $(BIN)/EthernetServerTest.cpp.bin $(TEST)/EthernetServerTest.cpp $(LIBS) -larduino +$(BIN)/EthernetServerTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/EthernetServerTest.cpp + $(GPP_TEST) -o $(BIN)/EthernetServerTest.cpp.bin $(TEST)/EthernetServerTest.cpp -larduino -$(BIN)/EthernetTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/EthernetTest.cpp - $(GPP_TEST) -o $(BIN)/EthernetTest.cpp.bin $(TEST)/EthernetTest.cpp $(LIBS) -larduino +$(BIN)/EthernetTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/EthernetTest.cpp + $(GPP_TEST) -o $(BIN)/EthernetTest.cpp.bin $(TEST)/EthernetTest.cpp -larduino -$(BIN)/JSONBuilderTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/JSONBuilderTest.cpp - $(GPP_TEST) -o $(BIN)/JSONBuilderTest.cpp.bin $(TEST)/JSONBuilderTest.cpp $(LIBS) -larduino +$(BIN)/JSONBuilderTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/JSONBuilderTest.cpp + $(GPP_TEST) -o $(BIN)/JSONBuilderTest.cpp.bin $(TEST)/JSONBuilderTest.cpp -larduino -$(BIN)/KeypadTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/KeypadTest.cpp - $(GPP_TEST) -o $(BIN)/KeypadTest.cpp.bin $(TEST)/KeypadTest.cpp $(LIBS) -larduino +$(BIN)/KeypadTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/KeypadTest.cpp + $(GPP_TEST) -o $(BIN)/KeypadTest.cpp.bin $(TEST)/KeypadTest.cpp -larduino -$(BIN)/LiquidCrystalTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/LiquidCrystalTest.cpp - $(GPP_TEST) -o $(BIN)/LiquidCrystalTest.cpp.bin $(TEST)/LiquidCrystalTest.cpp $(LIBS) -larduino +$(BIN)/LiquidCrystalTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/LiquidCrystalTest.cpp + $(GPP_TEST) -o $(BIN)/LiquidCrystalTest.cpp.bin $(TEST)/LiquidCrystalTest.cpp -larduino -$(BIN)/MenuTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/MenuTest.cpp - $(GPP_TEST) -o $(BIN)/MenuTest.cpp.bin $(TEST)/MenuTest.cpp $(LIBS) -larduino +$(BIN)/MenuTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/MenuTest.cpp + $(GPP_TEST) -o $(BIN)/MenuTest.cpp.bin $(TEST)/MenuTest.cpp -larduino -$(BIN)/NumberCollectorStateTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/NumberCollectorStateTest.cpp - $(GPP_TEST) -o $(BIN)/NumberCollectorStateTest.cpp.bin $(TEST)/NumberCollectorStateTest.cpp $(LIBS) -larduino +$(BIN)/NumberCollectorStateTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/NumberCollectorStateTest.cpp + $(GPP_TEST) -o $(BIN)/NumberCollectorStateTest.cpp.bin $(TEST)/NumberCollectorStateTest.cpp -larduino -$(BIN)/PHCalibrationHighTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationHighTest.cpp - $(GPP_TEST) -o $(BIN)/PHCalibrationHighTest.cpp.bin $(TEST)/PHCalibrationHighTest.cpp $(LIBS) -larduino +$(BIN)/PHCalibrationHighTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHCalibrationHighTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationHighTest.cpp.bin $(TEST)/PHCalibrationHighTest.cpp -larduino -$(BIN)/PHCalibrationLowTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationLowTest.cpp - $(GPP_TEST) -o $(BIN)/PHCalibrationLowTest.cpp.bin $(TEST)/PHCalibrationLowTest.cpp $(LIBS) -larduino +$(BIN)/PHCalibrationLowTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHCalibrationLowTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationLowTest.cpp.bin $(TEST)/PHCalibrationLowTest.cpp -larduino -$(BIN)/PHCalibrationMidTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHCalibrationMidTest.cpp - $(GPP_TEST) -o $(BIN)/PHCalibrationMidTest.cpp.bin $(TEST)/PHCalibrationMidTest.cpp $(LIBS) -larduino +$(BIN)/PHCalibrationMidTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHCalibrationMidTest.cpp + $(GPP_TEST) -o $(BIN)/PHCalibrationMidTest.cpp.bin $(TEST)/PHCalibrationMidTest.cpp -larduino -$(BIN)/PHControlTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHControlTest.cpp - $(GPP_TEST) -o $(BIN)/PHControlTest.cpp.bin $(TEST)/PHControlTest.cpp $(LIBS) -larduino +$(BIN)/PHControlTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHControlTest.cpp + $(GPP_TEST) -o $(BIN)/PHControlTest.cpp.bin $(TEST)/PHControlTest.cpp -larduino -$(BIN)/PHProbeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PHProbeTest.cpp - $(GPP_TEST) -o $(BIN)/PHProbeTest.cpp.bin $(TEST)/PHProbeTest.cpp $(LIBS) -larduino +$(BIN)/PHProbeTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHProbeTest.cpp + $(GPP_TEST) -o $(BIN)/PHProbeTest.cpp.bin $(TEST)/PHProbeTest.cpp -larduino -$(BIN)/PIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PIDTest.cpp - $(GPP_TEST) -o $(BIN)/PIDTest.cpp.bin $(TEST)/PIDTest.cpp $(LIBS) -larduino +$(BIN)/PIDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PIDTest.cpp + $(GPP_TEST) -o $(BIN)/PIDTest.cpp.bin $(TEST)/PIDTest.cpp -larduino -$(BIN)/PushingBoxTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/PushingBoxTest.cpp - $(GPP_TEST) -o $(BIN)/PushingBoxTest.cpp.bin $(TEST)/PushingBoxTest.cpp $(LIBS) -larduino +$(BIN)/PushingBoxTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PushingBoxTest.cpp + $(GPP_TEST) -o $(BIN)/PushingBoxTest.cpp.bin $(TEST)/PushingBoxTest.cpp -larduino -$(BIN)/SDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SDTest.cpp - $(GPP_TEST) -o $(BIN)/SDTest.cpp.bin $(TEST)/SDTest.cpp $(LIBS) -larduino +$(BIN)/SDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SDTest.cpp + $(GPP_TEST) -o $(BIN)/SDTest.cpp.bin $(TEST)/SDTest.cpp -larduino -$(BIN)/SeeDeviceAddressTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeDeviceAddressTest.cpp - $(GPP_TEST) -o $(BIN)/SeeDeviceAddressTest.cpp.bin $(TEST)/SeeDeviceAddressTest.cpp $(LIBS) -larduino +$(BIN)/SeeDeviceAddressTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeDeviceAddressTest.cpp + $(GPP_TEST) -o $(BIN)/SeeDeviceAddressTest.cpp.bin $(TEST)/SeeDeviceAddressTest.cpp -larduino -$(BIN)/SeeDeviceUptimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeDeviceUptimeTest.cpp - $(GPP_TEST) -o $(BIN)/SeeDeviceUptimeTest.cpp.bin $(TEST)/SeeDeviceUptimeTest.cpp $(LIBS) -larduino +$(BIN)/SeeDeviceUptimeTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeDeviceUptimeTest.cpp + $(GPP_TEST) -o $(BIN)/SeeDeviceUptimeTest.cpp.bin $(TEST)/SeeDeviceUptimeTest.cpp -larduino -$(BIN)/SeeFreeMemoryTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeFreeMemoryTest.cpp - $(GPP_TEST) -o $(BIN)/SeeFreeMemoryTest.cpp.bin $(TEST)/SeeFreeMemoryTest.cpp $(LIBS) -larduino +$(BIN)/SeeFreeMemoryTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeFreeMemoryTest.cpp + $(GPP_TEST) -o $(BIN)/SeeFreeMemoryTest.cpp.bin $(TEST)/SeeFreeMemoryTest.cpp -larduino -$(BIN)/SeeGoogleMinsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeGoogleMinsTest.cpp - $(GPP_TEST) -o $(BIN)/SeeGoogleMinsTest.cpp.bin $(TEST)/SeeGoogleMinsTest.cpp $(LIBS) -larduino +$(BIN)/SeeGoogleMinsTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeGoogleMinsTest.cpp + $(GPP_TEST) -o $(BIN)/SeeGoogleMinsTest.cpp.bin $(TEST)/SeeGoogleMinsTest.cpp -larduino -$(BIN)/SeeLogFileTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeLogFileTest.cpp - $(GPP_TEST) -o $(BIN)/SeeLogFileTest.cpp.bin $(TEST)/SeeLogFileTest.cpp $(LIBS) -larduino +$(BIN)/SeeLogFileTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeLogFileTest.cpp + $(GPP_TEST) -o $(BIN)/SeeLogFileTest.cpp.bin $(TEST)/SeeLogFileTest.cpp -larduino -$(BIN)/SeePHSlopeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePHSlopeTest.cpp - $(GPP_TEST) -o $(BIN)/SeePHSlopeTest.cpp.bin $(TEST)/SeePHSlopeTest.cpp $(LIBS) -larduino +$(BIN)/SeePHSlopeTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeePHSlopeTest.cpp + $(GPP_TEST) -o $(BIN)/SeePHSlopeTest.cpp.bin $(TEST)/SeePHSlopeTest.cpp -larduino -$(BIN)/SeePIDConstantsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePIDConstantsTest.cpp - $(GPP_TEST) -o $(BIN)/SeePIDConstantsTest.cpp.bin $(TEST)/SeePIDConstantsTest.cpp $(LIBS) -larduino +$(BIN)/SeePIDConstantsTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeePIDConstantsTest.cpp + $(GPP_TEST) -o $(BIN)/SeePIDConstantsTest.cpp.bin $(TEST)/SeePIDConstantsTest.cpp -larduino -$(BIN)/SeePhTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeePhTest.cpp - $(GPP_TEST) -o $(BIN)/SeePhTest.cpp.bin $(TEST)/SeePhTest.cpp $(LIBS) -larduino +$(BIN)/SeePhTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeePhTest.cpp + $(GPP_TEST) -o $(BIN)/SeePhTest.cpp.bin $(TEST)/SeePhTest.cpp -larduino -$(BIN)/SeeTankIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeTankIDTest.cpp - $(GPP_TEST) -o $(BIN)/SeeTankIDTest.cpp.bin $(TEST)/SeeTankIDTest.cpp $(LIBS) -larduino +$(BIN)/SeeTankIDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeTankIDTest.cpp + $(GPP_TEST) -o $(BIN)/SeeTankIDTest.cpp.bin $(TEST)/SeeTankIDTest.cpp -larduino -$(BIN)/SeeTempCalOffsetTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeTempCalOffsetTest.cpp - $(GPP_TEST) -o $(BIN)/SeeTempCalOffsetTest.cpp.bin $(TEST)/SeeTempCalOffsetTest.cpp $(LIBS) -larduino +$(BIN)/SeeTempCalOffsetTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeTempCalOffsetTest.cpp + $(GPP_TEST) -o $(BIN)/SeeTempCalOffsetTest.cpp.bin $(TEST)/SeeTempCalOffsetTest.cpp -larduino -$(BIN)/SeeVersionTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SeeVersionTest.cpp - $(GPP_TEST) -o $(BIN)/SeeVersionTest.cpp.bin $(TEST)/SeeVersionTest.cpp $(LIBS) -larduino +$(BIN)/SeeVersionTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SeeVersionTest.cpp + $(GPP_TEST) -o $(BIN)/SeeVersionTest.cpp.bin $(TEST)/SeeVersionTest.cpp -larduino -$(BIN)/SerialTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SerialTest.cpp - $(GPP_TEST) -o $(BIN)/SerialTest.cpp.bin $(TEST)/SerialTest.cpp $(LIBS) -larduino +$(BIN)/SerialTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SerialTest.cpp + $(GPP_TEST) -o $(BIN)/SerialTest.cpp.bin $(TEST)/SerialTest.cpp -larduino -$(BIN)/SetChillOrHeatTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetChillOrHeatTest.cpp - $(GPP_TEST) -o $(BIN)/SetChillOrHeatTest.cpp.bin $(TEST)/SetChillOrHeatTest.cpp $(LIBS) -larduino +$(BIN)/SetChillOrHeatTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetChillOrHeatTest.cpp + $(GPP_TEST) -o $(BIN)/SetChillOrHeatTest.cpp.bin $(TEST)/SetChillOrHeatTest.cpp -larduino -$(BIN)/SetGoogleSheetIntervalTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetGoogleSheetIntervalTest.cpp - $(GPP_TEST) -o $(BIN)/SetGoogleSheetIntervalTest.cpp.bin $(TEST)/SetGoogleSheetIntervalTest.cpp $(LIBS) -larduino +$(BIN)/SetGoogleSheetIntervalTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetGoogleSheetIntervalTest.cpp + $(GPP_TEST) -o $(BIN)/SetGoogleSheetIntervalTest.cpp.bin $(TEST)/SetGoogleSheetIntervalTest.cpp -larduino -$(BIN)/SetKDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKDTest.cpp - $(GPP_TEST) -o $(BIN)/SetKDTest.cpp.bin $(TEST)/SetKDTest.cpp $(LIBS) -larduino +$(BIN)/SetKDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetKDTest.cpp + $(GPP_TEST) -o $(BIN)/SetKDTest.cpp.bin $(TEST)/SetKDTest.cpp -larduino -$(BIN)/SetKITest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKITest.cpp - $(GPP_TEST) -o $(BIN)/SetKITest.cpp.bin $(TEST)/SetKITest.cpp $(LIBS) -larduino +$(BIN)/SetKITest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetKITest.cpp + $(GPP_TEST) -o $(BIN)/SetKITest.cpp.bin $(TEST)/SetKITest.cpp -larduino -$(BIN)/SetKPTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetKPTest.cpp - $(GPP_TEST) -o $(BIN)/SetKPTest.cpp.bin $(TEST)/SetKPTest.cpp $(LIBS) -larduino +$(BIN)/SetKPTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetKPTest.cpp + $(GPP_TEST) -o $(BIN)/SetKPTest.cpp.bin $(TEST)/SetKPTest.cpp -larduino -$(BIN)/SetPHCalibClearTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHCalibClearTest.cpp - $(GPP_TEST) -o $(BIN)/SetPHCalibClearTest.cpp.bin $(TEST)/SetPHCalibClearTest.cpp $(LIBS) -larduino +$(BIN)/SetPHCalibClearTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetPHCalibClearTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHCalibClearTest.cpp.bin $(TEST)/SetPHCalibClearTest.cpp -larduino -$(BIN)/SetPHSetPointTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHSetPointTest.cpp - $(GPP_TEST) -o $(BIN)/SetPHSetPointTest.cpp.bin $(TEST)/SetPHSetPointTest.cpp $(LIBS) -larduino +$(BIN)/SetPHSetPointTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetPHSetPointTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHSetPointTest.cpp.bin $(TEST)/SetPHSetPointTest.cpp -larduino -$(BIN)/SetPHWithSineTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetPHWithSineTest.cpp - $(GPP_TEST) -o $(BIN)/SetPHWithSineTest.cpp.bin $(TEST)/SetPHWithSineTest.cpp $(LIBS) -larduino +$(BIN)/SetPHWithSineTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetPHWithSineTest.cpp + $(GPP_TEST) -o $(BIN)/SetPHWithSineTest.cpp.bin $(TEST)/SetPHWithSineTest.cpp -larduino -$(BIN)/SetTankIDTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTankIDTest.cpp - $(GPP_TEST) -o $(BIN)/SetTankIDTest.cpp.bin $(TEST)/SetTankIDTest.cpp $(LIBS) -larduino +$(BIN)/SetTankIDTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetTankIDTest.cpp + $(GPP_TEST) -o $(BIN)/SetTankIDTest.cpp.bin $(TEST)/SetTankIDTest.cpp -larduino -$(BIN)/SetTempCalibClearTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempCalibClearTest.cpp - $(GPP_TEST) -o $(BIN)/SetTempCalibClearTest.cpp.bin $(TEST)/SetTempCalibClearTest.cpp $(LIBS) -larduino +$(BIN)/SetTempCalibClearTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetTempCalibClearTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempCalibClearTest.cpp.bin $(TEST)/SetTempCalibClearTest.cpp -larduino -$(BIN)/SetTempSetPointTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempSetPointTest.cpp - $(GPP_TEST) -o $(BIN)/SetTempSetPointTest.cpp.bin $(TEST)/SetTempSetPointTest.cpp $(LIBS) -larduino +$(BIN)/SetTempSetPointTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetTempSetPointTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempSetPointTest.cpp.bin $(TEST)/SetTempSetPointTest.cpp -larduino -$(BIN)/SetTempWithSineTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTempWithSineTest.cpp - $(GPP_TEST) -o $(BIN)/SetTempWithSineTest.cpp.bin $(TEST)/SetTempWithSineTest.cpp $(LIBS) -larduino +$(BIN)/SetTempWithSineTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetTempWithSineTest.cpp + $(GPP_TEST) -o $(BIN)/SetTempWithSineTest.cpp.bin $(TEST)/SetTempWithSineTest.cpp -larduino -$(BIN)/SetTimeTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/SetTimeTest.cpp - $(GPP_TEST) -o $(BIN)/SetTimeTest.cpp.bin $(TEST)/SetTimeTest.cpp $(LIBS) -larduino +$(BIN)/SetTimeTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/SetTimeTest.cpp + $(GPP_TEST) -o $(BIN)/SetTimeTest.cpp.bin $(TEST)/SetTimeTest.cpp -larduino -$(BIN)/StringsTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/StringsTest.cpp - $(GPP_TEST) -o $(BIN)/StringsTest.cpp.bin $(TEST)/StringsTest.cpp $(LIBS) -larduino +$(BIN)/StringsTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/StringsTest.cpp + $(GPP_TEST) -o $(BIN)/StringsTest.cpp.bin $(TEST)/StringsTest.cpp -larduino -$(BIN)/TCLibTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TCLibTest.cpp - $(GPP_TEST) -o $(BIN)/TCLibTest.cpp.bin $(TEST)/TCLibTest.cpp $(LIBS) -larduino +$(BIN)/TCLibTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/TCLibTest.cpp + $(GPP_TEST) -o $(BIN)/TCLibTest.cpp.bin $(TEST)/TCLibTest.cpp -larduino -$(BIN)/TempProbe_TCTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TempProbe_TCTest.cpp - $(GPP_TEST) -o $(BIN)/TempProbe_TCTest.cpp.bin $(TEST)/TempProbe_TCTest.cpp $(LIBS) -larduino +$(BIN)/TempProbe_TCTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/TempProbe_TCTest.cpp + $(GPP_TEST) -o $(BIN)/TempProbe_TCTest.cpp.bin $(TEST)/TempProbe_TCTest.cpp -larduino -$(BIN)/TemperatureCalibrationTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TemperatureCalibrationTest.cpp - $(GPP_TEST) -o $(BIN)/TemperatureCalibrationTest.cpp.bin $(TEST)/TemperatureCalibrationTest.cpp $(LIBS) -larduino +$(BIN)/TemperatureCalibrationTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/TemperatureCalibrationTest.cpp + $(GPP_TEST) -o $(BIN)/TemperatureCalibrationTest.cpp.bin $(TEST)/TemperatureCalibrationTest.cpp -larduino -$(BIN)/TemperatureControlTest.cpp.bin: $(LIBS_SO) $(BIN)/libarduino.so $(TEST)/TemperatureControlTest.cpp - $(GPP_TEST) -o $(BIN)/TemperatureControlTest.cpp.bin $(TEST)/TemperatureControlTest.cpp $(LIBS) -larduino +$(BIN)/TemperatureControlTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/TemperatureControlTest.cpp + $(GPP_TEST) -o $(BIN)/TemperatureControlTest.cpp.bin $(TEST)/TemperatureControlTest.cpp -larduino BUSIO=$(BIN)/BusIO.o $(BIN)/I2CDevice.o $(BIN)/SPIDevice.o ETHERNET=$(BIN)/Dhcp.o $(BIN)/Dns.o $(BIN)/Ethernet.o $(BIN)/EthernetClient.o $(BIN)/EthernetClient_CI.o \ @@ -248,9 +248,9 @@ OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTest $(BIN)/SetTime.o $(BIN)/TemperatureCalibration.o $(BIN)/UIState.o $(BIN)/Wait.o \ $(BUSIO) $(LCD) $(MAX31865) $(BIN)/PID.o $(ETHERNET) $(RTC) $(KEYPAD) $(SDFAT) -$(BIN)/libarduino.so: $(OBJECTS) $(LIBS_SO) - g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(LIBRARIES)/TankController/.arduino_ci \ - $(INCLUDE) -o $(BIN)/libarduino.so $(OBJECTS) $(LIBS) +$(BIN)/libarduino.so: $(OBJECTS) + g++ $(FLAGS) -shared -Wl,-undefined,dynamic_lookup -L$(BIN) $(INCLUDE) \ + -o $(BIN)/libarduino.so $(OBJECTS) $(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp From a4eb34e53bbe89b844ba36792c013fa84218641c Mon Sep 17 00:00:00 2001 From: James Foster Date: Tue, 18 Jul 2023 07:51:46 -0700 Subject: [PATCH 6/8] Use jgfoster's branch of arduino_ci to assist in testing performance. --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ec33d5363..16d1d7a3a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' -gem 'arduino_ci', github: 'Arduino-CI/arduino_ci', branch: 'master' +# gem 'arduino_ci', github: 'Arduino-CI/arduino_ci', branch: 'master' +gem 'arduino_ci', github: 'jgfoster/arduino_ci', branch: 'makefile' # Following are alternate ways to reference a specific tag or commit # This is helpful when a change to arduino_ci breaks the tests From d27a647213ead43b170b06feee0afde49856b8dc Mon Sep 17 00:00:00 2001 From: James Foster Date: Tue, 18 Jul 2023 08:04:50 -0700 Subject: [PATCH 7/8] Add FatFileLFN to Makefile. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76a9a6d59..460763e2a 100644 --- a/Makefile +++ b/Makefile @@ -224,9 +224,10 @@ KEYPAD=$(BIN)/Key.o $(BIN)/Keypad.o $(BIN)/Keypad_CI.o SDFAT=$(BIN)/FreeStack.o $(BIN)/MinimumSerial.o $(BIN)/File_CI.o $(BIN)/SD_CI.o $(BIN)/ExFatDbg.o \ $(BIN)/ExFatFile.o $(BIN)/ExFatFilePrint.o $(BIN)/ExFatFileWrite.o $(BIN)/ExFatFormatter.o \ $(BIN)/ExFatName.o $(BIN)/ExFatPartition.o $(BIN)/ExFatVolume.o $(BIN)/FatDbg.o $(BIN)/FatFile.o \ + $(BIN)/FatFileLFN.o $(BIN)/FatFileSFN.o \ $(BIN)/FatFormatter.o $(BIN)/FatName.o $(BIN)/FatPartition.o $(BIN)/FatVolume.o $(BIN)/FsFile.o \ $(BIN)/FsNew.o $(BIN)/FsVolume.o $(BIN)/SdCardInfo.o $(BIN)/SdSpiCard.o $(BIN)/SdioTeensy.o \ - $(BIN)/SdSpiArtemis.o $(BIN)/SdSpiChipSelect.o $(BIN)/SdSpiDue.o $(BIN)/SdSpiESP.o $(BIN)/FatFileSFN.o \ + $(BIN)/SdSpiArtemis.o $(BIN)/SdSpiChipSelect.o $(BIN)/SdSpiDue.o $(BIN)/SdSpiESP.o \ $(BIN)/SdSpiParticle.o $(BIN)/SdSpiSTM32.o $(BIN)/SdSpiSTM32Core.o $(BIN)/SdSpiTeensy3.o \ $(BIN)/FmtNumber.o $(BIN)/FsCache.o $(BIN)/FsDateTime.o $(BIN)/FsName.o $(BIN)/FsStructs.o \ $(BIN)/FsUtf.o $(BIN)/PrintBasic.o $(BIN)/upcase.o $(BIN)/StdioStream.o $(BIN)/StreamBaseClass.o \ @@ -553,6 +554,9 @@ $(BIN)/FatDbg.o: $(LIBRARIES)/SdFat/src/FatLib/FatDbg.cpp $(BIN)/FatFile.o: $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFile.o $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp +$(BIN)/FatFileLFN.o: $(LIBRARIES)/SdFat/src/FatLib/FatFileLFN.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFileLFN.o $(LIBRARIES)/SdFat/src/FatLib/FatFileLFN.cpp + $(BIN)/FatFileSFN.o: $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFileSFN.o $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp From a4c6d5d44d34dacaff4a224b4844bd51435adc93 Mon Sep 17 00:00:00 2001 From: James Foster Date: Tue, 18 Jul 2023 08:11:10 -0700 Subject: [PATCH 8/8] Add `FatFilePrint` to Makefile. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 460763e2a..1c7365065 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ KEYPAD=$(BIN)/Key.o $(BIN)/Keypad.o $(BIN)/Keypad_CI.o SDFAT=$(BIN)/FreeStack.o $(BIN)/MinimumSerial.o $(BIN)/File_CI.o $(BIN)/SD_CI.o $(BIN)/ExFatDbg.o \ $(BIN)/ExFatFile.o $(BIN)/ExFatFilePrint.o $(BIN)/ExFatFileWrite.o $(BIN)/ExFatFormatter.o \ $(BIN)/ExFatName.o $(BIN)/ExFatPartition.o $(BIN)/ExFatVolume.o $(BIN)/FatDbg.o $(BIN)/FatFile.o \ - $(BIN)/FatFileLFN.o $(BIN)/FatFileSFN.o \ + $(BIN)/FatFileLFN.o $(BIN)/FatFilePrint.o $(BIN)/FatFileSFN.o \ $(BIN)/FatFormatter.o $(BIN)/FatName.o $(BIN)/FatPartition.o $(BIN)/FatVolume.o $(BIN)/FsFile.o \ $(BIN)/FsNew.o $(BIN)/FsVolume.o $(BIN)/SdCardInfo.o $(BIN)/SdSpiCard.o $(BIN)/SdioTeensy.o \ $(BIN)/SdSpiArtemis.o $(BIN)/SdSpiChipSelect.o $(BIN)/SdSpiDue.o $(BIN)/SdSpiESP.o \ @@ -557,6 +557,9 @@ $(BIN)/FatFile.o: $(LIBRARIES)/SdFat/src/FatLib/FatFile.cpp $(BIN)/FatFileLFN.o: $(LIBRARIES)/SdFat/src/FatLib/FatFileLFN.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFileLFN.o $(LIBRARIES)/SdFat/src/FatLib/FatFileLFN.cpp +$(BIN)/FatFilePrint.o: $(LIBRARIES)/SdFat/src/FatLib/FatFilePrint.cpp + g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFilePrint.o $(LIBRARIES)/SdFat/src/FatLib/FatFilePrint.cpp + $(BIN)/FatFileSFN.o: $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/FatFileSFN.o $(LIBRARIES)/SdFat/src/FatLib/FatFileSFN.cpp