ESP32_ChinaDieselHeater_Con.../src
Ray Jones aa90c83a06 Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD
Conflicts resolved:
	src/Afterburner.cpp
	src/Bluetooth/BluetoothHC05.cpp
	src/OLED/433MHzScreen.cpp
	src/OLED/433MHzScreen.h
	src/Protocol/BlueWireTask.cpp
	src/Protocol/TxManage.cpp
2020-06-19 17:03:41 +10:00
..
Bluetooth Manual selective Merge from bleeding edge, pulling in 433MHz, new HC05 and NV storage semaphore fix. 2020-06-19 11:24:44 +10:00
cfg Manual selective Merge from bleeding edge, pulling in 433MHz, new HC05 and NV storage semaphore fix. 2020-06-19 11:24:44 +10:00
OLED Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD 2020-06-19 17:03:41 +10:00
Protocol Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD 2020-06-19 17:03:41 +10:00
RTC Manual selective Merge from bleeding edge, pulling in 433MHz, new HC05 and NV storage semaphore fix. 2020-06-19 11:24:44 +10:00
Utility Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD 2020-06-19 17:03:41 +10:00
WiFi Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD 2020-06-19 17:03:41 +10:00
Afterburner.cpp Merge branch 'NewHC05Changes_433Mhz' into BlueDigitLCD 2020-06-19 17:03:41 +10:00
README.txt Refactored directory hierarchy to regain some linker command line space in PIO 2019-07-23 22:32:36 +10:00

When building with Platform IO, base file must be "Afterburner.CPP"