diff --git a/Bootload/AfterburnerV3.1.5.bin b/Bootload/AfterburnerV3.1.5.bin deleted file mode 100644 index 264c9a9..0000000 Binary files a/Bootload/AfterburnerV3.1.5.bin and /dev/null differ diff --git a/Bootload/AfterburnerV3.1.9.bin b/Bootload/AfterburnerV3.1.9.bin new file mode 100644 index 0000000..525bcaf Binary files /dev/null and b/Bootload/AfterburnerV3.1.9.bin differ diff --git a/Bootload/COM.bat b/Bootload/COM.bat index cc23a40..b815e4d 100644 --- a/Bootload/COM.bat +++ b/Bootload/COM.bat @@ -1,5 +1,5 @@ REM Firmware -esptool.exe --chip esp32 --port COM5 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.1.5.bin 0x8000 Afterburner.partitions.bin +esptool.exe --chip esp32 --port COM5 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 ..\releases\AfterburnerV3.1.9.bin 0x8000 Afterburner.partitions.bin REM SPIFFS esptool.exe --chip esp32 --port COM5 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_size detect 0x3d0000 spiffs.bin diff --git a/platformio.ini b/platformio.ini index b244765..3f725c6 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,7 +25,7 @@ upload_protocol = esptool extra_scripts = post:add_CRC.py ; replace shitty Arduino millis with a linear time version build_flags = - -Wl,--wrap,millis + -Wl,--wrap,millis debug_tool = esp-prog ;upload_protocol = esp-prog -debug_init_break = \ No newline at end of file +debug_init_break = diff --git a/src/Afterburner.cpp b/src/Afterburner.cpp index 16ad569..d12d0c1 100644 --- a/src/Afterburner.cpp +++ b/src/Afterburner.cpp @@ -125,9 +125,9 @@ #define RX_DATA_TIMOUT 50 const int FirmwareRevision = 31; -const int FirmwareSubRevision = 7; -const int FirmwareMinorRevision = 6; -const char* FirmwareDate = "9 Jan 2020"; +const int FirmwareSubRevision = 9; +const int FirmwareMinorRevision = 0; +const char* FirmwareDate = "14 Jan 2020"; #ifdef ESP32 @@ -1512,9 +1512,13 @@ void checkDebugCommands() mode = 2; } else if(rxVal == 'i') { - DebugPort.println("Test fan bytes"); + DebugPort.println("Test unknown bytes MSB"); mode = 3; } + else if(rxVal == 'a') { + DebugPort.println("Test unknown bytes LSB"); + mode = 5; + } else if(rxVal == 'c') { DebugPort.println("Test Command Byte... "); mode = 4; @@ -1525,7 +1529,7 @@ void checkDebugCommands() mode = 0; DefaultBTCParams.Controller.Command = 0; } - else if(rxVal == ']') { + else if(rxVal == ']') { val++; bSendVal = true; } @@ -1595,13 +1599,15 @@ void checkDebugCommands() DefaultBTCParams.Controller.GlowDrive = val & 0xff; // always 0x05 break; case 3: - DefaultBTCParams.Controller.Unknown2_MSB = (val >> 8) & 0xff; // always 0x0d - DefaultBTCParams.Controller.Unknown2_LSB = (val >> 0) & 0xff; // always 0xac 16bit: "3500" ?? Ignition fan max RPM???? + DefaultBTCParams.Controller.Unknown1_MSB = val & 0xff; break; case 4: DebugPort.printf("Forced controller command = %d\r\n", val&0xff); DefaultBTCParams.Controller.Command = val & 0xff; break; + case 5: + DefaultBTCParams.Controller.Unknown1_LSB = val & 0xff; + break; } } #endif diff --git a/src/OLED/VersionInfoScreen.cpp b/src/OLED/VersionInfoScreen.cpp index 7e8850e..704b4d3 100644 --- a/src/OLED/VersionInfoScreen.cpp +++ b/src/OLED/VersionInfoScreen.cpp @@ -218,7 +218,7 @@ CVersionInfoScreen::keyHandler(uint8_t event) // CENTRE press if(event & key_Centre) { if(_rowSel == 3) { // factory enable selection - _rowSel = SaveConfirm; + _confirmSave(); } else if(_rowSel == 1) { // firmware update selection _rowSel = 20; diff --git a/src/Protocol/TxManage.cpp b/src/Protocol/TxManage.cpp index 2f6db9c..f37a202 100644 --- a/src/Protocol/TxManage.cpp +++ b/src/Protocol/TxManage.cpp @@ -151,6 +151,7 @@ CTxManage::PrepareFrame(const CProtocol& basisFrame, bool isBTCmaster) } else { m_TxFrame.setAltitude(3500); // default height - yes it is weird, but that's what the simple controllers send! +// m_TxFrame.setAltitude(0); // default height - yes it is weird, but that's what the simple controllers send! } float tActual = getTemperatureSensor();