diff --git a/Arduino/.gitignore b/Arduino/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/Arduino/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/Arduino/.pio/build/esp12e/.sconsign311.dblite b/Arduino/.pio/build/esp12e/.sconsign311.dblite deleted file mode 100644 index 82b4289..0000000 Binary files a/Arduino/.pio/build/esp12e/.sconsign311.dblite and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Crypto.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Crypto.cpp.o deleted file mode 100644 index 21e3b18..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Crypto.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-frag.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-frag.cpp.o deleted file mode 100644 index aade695..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-frag.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-version.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-version.cpp.o deleted file mode 100644 index f32448d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp-version.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Esp.cpp.o deleted file mode 100644 index 63aec43..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Esp.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/FS.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/FS.cpp.o deleted file mode 100644 index a7fdf5e..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/FS.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/FSnoop.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/FSnoop.cpp.o deleted file mode 100644 index be7ef75..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/FSnoop.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/FunctionalInterrupt.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/FunctionalInterrupt.cpp.o deleted file mode 100644 index d7a109f..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/FunctionalInterrupt.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/HardwareSerial.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/HardwareSerial.cpp.o deleted file mode 100644 index 493eaca..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/HardwareSerial.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/IPAddress.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/IPAddress.cpp.o deleted file mode 100644 index dd7a58e..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/IPAddress.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer-NonOS.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer-NonOS.cpp.o deleted file mode 100644 index 2c706eb..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer-NonOS.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer.cpp.o deleted file mode 100644 index 228592b..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipDhcpServer.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntf.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntf.cpp.o deleted file mode 100644 index 1d7e554..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntf.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntfCB.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntfCB.cpp.o deleted file mode 100644 index 38d2039..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/LwipIntfCB.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/MD5Builder.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/MD5Builder.cpp.o deleted file mode 100644 index 75e0d78..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/MD5Builder.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Print.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Print.cpp.o deleted file mode 100644 index 782cca9..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Print.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Schedule.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Schedule.cpp.o deleted file mode 100644 index 93a13f6..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Schedule.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/StackThunk.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/StackThunk.cpp.o deleted file mode 100644 index 11e0440..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/StackThunk.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Stream.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Stream.cpp.o deleted file mode 100644 index 3376cae..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Stream.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/StreamSend.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/StreamSend.cpp.o deleted file mode 100644 index 959b270..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/StreamSend.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Tone.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Tone.cpp.o deleted file mode 100644 index cd47ac8..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Tone.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/TypeConversion.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/TypeConversion.cpp.o deleted file mode 100644 index fa0368a..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/TypeConversion.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/Updater.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/Updater.cpp.o deleted file mode 100644 index 961d63d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/Updater.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/WMath.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/WMath.cpp.o deleted file mode 100644 index a6d17ae..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/WMath.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/WString.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/WString.cpp.o deleted file mode 100644 index 5b1b941..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/WString.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/abi.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/abi.cpp.o deleted file mode 100644 index 0ec4b1d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/abi.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/aes_unwrap.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/aes_unwrap.cpp.o deleted file mode 100644 index 68e64e0..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/aes_unwrap.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/base64.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/base64.cpp.o deleted file mode 100644 index ef7b697..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/base64.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/cbuf.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/cbuf.cpp.o deleted file mode 100644 index 4237271..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/cbuf.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/cont.S.o b/Arduino/.pio/build/esp12e/FrameworkArduino/cont.S.o deleted file mode 100644 index 2149e48..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/cont.S.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/cont_util.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/cont_util.cpp.o deleted file mode 100644 index a6a06b5..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/cont_util.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o deleted file mode 100644 index 81cea53..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_app_entry_noextra4k.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_eboot_command.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_eboot_command.cpp.o deleted file mode 100644 index 55b7cba..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_eboot_command.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_features.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_features.cpp.o deleted file mode 100644 index 7a48830..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_features.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_quirks.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_quirks.cpp.o deleted file mode 100644 index c13c566..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_quirks.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_utils.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_utils.cpp.o deleted file mode 100644 index bb50af4..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_flash_utils.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_i2s.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_i2s.cpp.o deleted file mode 100644 index 8f23b3f..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_i2s.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_main.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_main.cpp.o deleted file mode 100644 index 983105d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_main.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_non32xfer.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_non32xfer.cpp.o deleted file mode 100644 index e24f3f3..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_non32xfer.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_noniso.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_noniso.cpp.o deleted file mode 100644 index eeb9cc5..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_noniso.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_phy.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_phy.cpp.o deleted file mode 100644 index 4c60279..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_phy.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_postmortem.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_postmortem.cpp.o deleted file mode 100644 index f18b440..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_postmortem.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_si2c.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_si2c.cpp.o deleted file mode 100644 index fd88edf..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_si2c.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_sigma_delta.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_sigma_delta.cpp.o deleted file mode 100644 index 6861e0a..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_sigma_delta.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_spi_utils.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_spi_utils.cpp.o deleted file mode 100644 index 0e386d9..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_spi_utils.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_timer.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_timer.cpp.o deleted file mode 100644 index c43b1e3..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_timer.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_vm.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_vm.cpp.o deleted file mode 100644 index 3caa46d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_vm.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_phase.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_phase.cpp.o deleted file mode 100644 index 4bd2453..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_phase.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_pwm.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_pwm.cpp.o deleted file mode 100644 index dd1fdbe..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_waveform_pwm.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring.cpp.o deleted file mode 100644 index c68777c..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_analog.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_analog.cpp.o deleted file mode 100644 index 3da17da..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_analog.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_digital.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_digital.cpp.o deleted file mode 100644 index ba37f70..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_digital.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o deleted file mode 100644 index e596bd1..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pulse.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o deleted file mode 100644 index 266a008..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_pwm.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_shift.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_shift.cpp.o deleted file mode 100644 index 27f174d..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/core_esp8266_wiring_shift.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/crc32.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/crc32.cpp.o deleted file mode 100644 index e36dd24..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/crc32.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/debug.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/debug.cpp.o deleted file mode 100644 index 2bc2bdd..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/debug.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/exc-c-wrapper-handler.S.o b/Arduino/.pio/build/esp12e/FrameworkArduino/exc-c-wrapper-handler.S.o deleted file mode 100644 index e62a7d7..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/exc-c-wrapper-handler.S.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/exc-sethandler.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/exc-sethandler.cpp.o deleted file mode 100644 index 6817102..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/exc-sethandler.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/flash_hal.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/flash_hal.cpp.o deleted file mode 100644 index 11eff3b..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/flash_hal.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/gdb_hooks.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/gdb_hooks.cpp.o deleted file mode 100644 index 1a64b09..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/gdb_hooks.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/heap.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/heap.cpp.o deleted file mode 100644 index b76a2f8..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/heap.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/hwdt_app_entry.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/hwdt_app_entry.cpp.o deleted file mode 100644 index 680e038..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/hwdt_app_entry.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cdecode.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cdecode.cpp.o deleted file mode 100644 index 35e81d3..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cdecode.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cencode.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cencode.cpp.o deleted file mode 100644 index 706df77..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/libb64/cencode.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/libc_replacements.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/libc_replacements.cpp.o deleted file mode 100644 index e88a0b6..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/libc_replacements.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/mmu_iram.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/mmu_iram.cpp.o deleted file mode 100644 index beab79c..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/mmu_iram.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/reboot_uart_dwnld.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/reboot_uart_dwnld.cpp.o deleted file mode 100644 index d44d0c1..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/reboot_uart_dwnld.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_cache.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_cache.cpp.o deleted file mode 100644 index 05faf3c..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_cache.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_check.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_check.cpp.o deleted file mode 100644 index 3dc870c..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_check.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_gc.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_gc.cpp.o deleted file mode 100644 index 291311c..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_gc.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o deleted file mode 100644 index 1f583ab..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_hydrogen.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o deleted file mode 100644 index 53fdc60..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs/spiffs_nucleus.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs_api.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs_api.cpp.o deleted file mode 100644 index c5c59e5..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/spiffs_api.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/sqrt32.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/sqrt32.cpp.o deleted file mode 100644 index 68dddff..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/sqrt32.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/stdlib_noniso.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/stdlib_noniso.cpp.o deleted file mode 100644 index 40cec0f..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/stdlib_noniso.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/time.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/time.cpp.o deleted file mode 100644 index 84542e7..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/time.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/uart.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/uart.cpp.o deleted file mode 100644 index f8cb413..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/uart.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_info.c.o b/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_info.c.o deleted file mode 100644 index 489cf44..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_info.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_integrity.c.o b/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_integrity.c.o deleted file mode 100644 index 3e75219..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_integrity.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_local.c.o b/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_local.c.o deleted file mode 100644 index 3baf130..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_local.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_malloc.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_malloc.cpp.o deleted file mode 100644 index 49a84d8..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_malloc.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_poison.c.o b/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_poison.c.o deleted file mode 100644 index 9819aad..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/umm_malloc/umm_poison.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/FrameworkArduino/wpa2_eap_patch.cpp.o b/Arduino/.pio/build/esp12e/FrameworkArduino/wpa2_eap_patch.cpp.o deleted file mode 100644 index 88cf86e..0000000 Binary files a/Arduino/.pio/build/esp12e/FrameworkArduino/wpa2_eap_patch.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/firmware.bin b/Arduino/.pio/build/esp12e/firmware.bin deleted file mode 100644 index 3393235..0000000 Binary files a/Arduino/.pio/build/esp12e/firmware.bin and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/firmware.elf b/Arduino/.pio/build/esp12e/firmware.elf deleted file mode 100644 index a62411d..0000000 Binary files a/Arduino/.pio/build/esp12e/firmware.elf and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/idedata.json b/Arduino/.pio/build/esp12e/idedata.json index 4a7dac4..5a959c3 100644 --- a/Arduino/.pio/build/esp12e/idedata.json +++ b/Arduino/.pio/build/esp12e/idedata.json @@ -1 +1 @@ -{"build_type": "release", "env_name": "esp12e", "libsource_dirs": ["c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\lib", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e", "C:\\Users\\applenana\\.platformio\\lib", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries"], "defines": ["PLATFORMIO=60116", "ESP8266", "ARDUINO_ARCH_ESP8266", "ARDUINO_ESP8266_ESP12", "F_CPU=80000000L", "__ets__", "ICACHE_FLASH", "_GNU_SOURCE", "ARDUINO=10805", "ARDUINO_BOARD=\"PLATFORMIO_ESP12E\"", "ARDUINO_BOARD_ID=\"esp12e\"", "FLASHMODE_DIO", "LWIP_OPEN_SRC", "NONOSDK22x_190703=1", "TCP_MSS=536", "LWIP_FEATURES=1", "LWIP_IPV6=0", "VTABLES_IN_FLASH", "MMU_IRAM_SIZE=0x8000", "MMU_ICACHE_SIZE=0x8000"], "includes": {"build": ["c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\include", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Servo\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\LittleFS\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\ServoEasing\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\Adafruit NeoPixel", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\CRC\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\tools\\sdk\\include", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\cores\\esp8266", "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\include", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\tools\\sdk\\lwip2\\include", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\variants\\nodemcu"], "compatlib": ["c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\Adafruit NeoPixel", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\CRC\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\ServoEasing\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\LittleFS\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Servo\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\ArduinoJson\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\PubSubClient\\src", "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\libdeps\\esp12e\\Unity\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ArduinoOTA", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\DNSServer\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\EEPROM", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266AVRISP\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266HTTPClient\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266HTTPUpdateServer\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266LLMNR", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266NetBIOS", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266SSDP", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266SdFat\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WebServer\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WiFi\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WiFiMesh\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266httpUpdate\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266mDNS\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Ethernet\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\FSTools", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\GDBStub\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Hash\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\I2S\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Netdump\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SD\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SDFS\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SPI", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SPISlave\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SoftwareSerial\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\TFT_Touch_Shield_V2", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Ticker\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Wire", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\esp8266\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_Ethernet\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_PPP\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_enc28j60\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_w5100\\src", "C:\\Users\\applenana\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_w5500\\src"], "toolchain": ["C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include\\c++\\10.3.0", "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include\\c++\\10.3.0\\xtensa-lx106-elf", "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\lib\\gcc\\xtensa-lx106-elf\\10.3.0\\include", "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\lib\\gcc\\xtensa-lx106-elf\\10.3.0\\include-fixed", "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include"]}, "cc_flags": ["-std=gnu17", "-Wpointer-arith", "-Wno-implicit-function-declaration", "-Wl,-EL", "-fno-inline-functions", "-nostdlib", "-Os", "-mlongcalls", "-mtext-section-literals", "-falign-functions=4", "-U__STRICT_ANSI__", "-ffunction-sections", "-fdata-sections", "-Wall", "-Werror=return-type", "-free", "-fipa-pta"], "cxx_flags": ["-fno-rtti", "-std=gnu++17", "-fno-exceptions", "-Os", "-mlongcalls", "-mtext-section-literals", "-falign-functions=4", "-U__STRICT_ANSI__", "-ffunction-sections", "-fdata-sections", "-Wall", "-Werror=return-type", "-free", "-fipa-pta"], "cc_path": "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-gcc.exe", "cxx_path": "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-g++.exe", "gdb_path": "C:\\Users\\applenana\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-gdb.exe", "prog_path": "c:\\Users\\applenana\\Desktop\\ams\u9879\u76ee\\arduino\\FAMSL\\.pio\\build\\esp12e\\firmware.elf", "svd_path": null, "compiler_type": "gcc", "targets": [{"name": "buildfs", "title": "Build Filesystem Image", "description": null, "group": "Platform"}, {"name": "size", "title": "Program Size", "description": "Calculate program size", "group": "Platform"}, {"name": "upload", "title": "Upload", "description": null, "group": "Platform"}, {"name": "uploadfs", "title": "Upload Filesystem Image", "description": null, "group": "Platform"}, {"name": "uploadfsota", "title": "Upload Filesystem Image OTA", "description": null, "group": "Platform"}, {"name": "erase", "title": "Erase Flash", "description": null, "group": "Platform"}], "extra": {"flash_images": []}} \ No newline at end of file +{"build_type": "release", "env_name": "esp12e", "libsource_dirs": ["D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\lib", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e", "C:\\Users\\64437\\.platformio\\lib", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries"], "defines": ["PLATFORMIO=60116", "ESP8266", "ARDUINO_ARCH_ESP8266", "ARDUINO_ESP8266_ESP12", "F_CPU=80000000L", "__ets__", "ICACHE_FLASH", "_GNU_SOURCE", "ARDUINO=10805", "ARDUINO_BOARD=\"PLATFORMIO_ESP12E\"", "ARDUINO_BOARD_ID=\"esp12e\"", "FLASHMODE_DIO", "LWIP_OPEN_SRC", "NONOSDK22x_190703=1", "TCP_MSS=536", "LWIP_FEATURES=1", "LWIP_IPV6=0", "VTABLES_IN_FLASH", "MMU_IRAM_SIZE=0x8000", "MMU_ICACHE_SIZE=0x8000"], "includes": {"build": ["D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\include", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Servo\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\LittleFS\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\ServoEasing\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\Adafruit NeoPixel", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\CRC\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\tools\\sdk\\include", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\cores\\esp8266", "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\include", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\tools\\sdk\\lwip2\\include", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\variants\\nodemcu"], "compatlib": ["D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\Adafruit NeoPixel", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\CRC\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\ServoEasing\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\LittleFS\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Servo\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\ArduinoJson\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\PubSubClient\\src", "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\libdeps\\esp12e\\Unity\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ArduinoOTA", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\DNSServer\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\EEPROM", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266AVRISP\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266HTTPClient\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266HTTPUpdateServer\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266LLMNR", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266NetBIOS", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266SSDP", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266SdFat\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WebServer\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WiFi\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266WiFiMesh\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266httpUpdate\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\ESP8266mDNS\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Ethernet\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\FSTools", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\GDBStub\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Hash\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\I2S\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Netdump\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SD\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SDFS\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SPI", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SPISlave\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\SoftwareSerial\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\TFT_Touch_Shield_V2", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Ticker\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\Wire", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\esp8266\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_Ethernet\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_PPP\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_enc28j60\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_w5100\\src", "C:\\Users\\64437\\.platformio\\packages\\framework-arduinoespressif8266\\libraries\\lwIP_w5500\\src"], "toolchain": ["C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include\\c++\\10.3.0", "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include\\c++\\10.3.0\\xtensa-lx106-elf", "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\lib\\gcc\\xtensa-lx106-elf\\10.3.0\\include", "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\lib\\gcc\\xtensa-lx106-elf\\10.3.0\\include-fixed", "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\xtensa-lx106-elf\\include"]}, "cc_flags": ["-std=gnu17", "-Wpointer-arith", "-Wno-implicit-function-declaration", "-Wl,-EL", "-fno-inline-functions", "-nostdlib", "-Os", "-mlongcalls", "-mtext-section-literals", "-falign-functions=4", "-U__STRICT_ANSI__", "-ffunction-sections", "-fdata-sections", "-Wall", "-Werror=return-type", "-free", "-fipa-pta"], "cxx_flags": ["-fno-rtti", "-std=gnu++17", "-fno-exceptions", "-Os", "-mlongcalls", "-mtext-section-literals", "-falign-functions=4", "-U__STRICT_ANSI__", "-ffunction-sections", "-fdata-sections", "-Wall", "-Werror=return-type", "-free", "-fipa-pta"], "cc_path": "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-gcc.exe", "cxx_path": "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-g++.exe", "gdb_path": "C:\\Users\\64437\\.platformio\\packages\\toolchain-xtensa\\bin\\xtensa-lx106-elf-gdb.exe", "prog_path": "D:\\Desktop\\AP-AMS\\AP-AMS-FakeAMSLite\\Arduino\\.pio\\build\\esp12e\\firmware.elf", "svd_path": null, "compiler_type": "gcc", "targets": [{"name": "buildfs", "title": "Build Filesystem Image", "description": null, "group": "Platform"}, {"name": "size", "title": "Program Size", "description": "Calculate program size", "group": "Platform"}, {"name": "upload", "title": "Upload", "description": null, "group": "Platform"}, {"name": "uploadfs", "title": "Upload Filesystem Image", "description": null, "group": "Platform"}, {"name": "uploadfsota", "title": "Upload Filesystem Image OTA", "description": null, "group": "Platform"}, {"name": "erase", "title": "Erase Flash", "description": null, "group": "Platform"}], "extra": {"flash_images": []}} \ No newline at end of file diff --git a/Arduino/.pio/build/esp12e/ld/local.eagle.app.v6.common.ld b/Arduino/.pio/build/esp12e/ld/local.eagle.app.v6.common.ld deleted file mode 100644 index e4de427..0000000 --- a/Arduino/.pio/build/esp12e/ld/local.eagle.app.v6.common.ld +++ /dev/null @@ -1,285 +0,0 @@ -/* This linker script generated from xt-genldscripts.tpp for LSP . */ -/* Linker Script for ld -N */ -/* The restriction to one MEMORY command, appears to be a restriction in - past versions. https://stackoverflow.com/a/55673816 - This 2nd MEMORY command appears to work fine. -*/ -MEMORY -{ - iram1_0_seg : org = 0x40100000, len = 0x8000 -} -PHDRS -{ - dport0_0_phdr PT_LOAD; - dram0_0_phdr PT_LOAD; - dram0_0_bss_phdr PT_LOAD; - iram1_0_phdr PT_LOAD; - irom0_0_phdr PT_LOAD; -} -/* Default entry point: */ -ENTRY(app_entry) -EXTERN(_DebugExceptionVector) -EXTERN(_DoubleExceptionVector) -EXTERN(_KernelExceptionVector) -EXTERN(_NMIExceptionVector) -EXTERN(_UserExceptionVector) -EXTERN(core_version) -PROVIDE(_memmap_vecbase_reset = 0x40000000); -/* Various memory-map dependent cache attribute settings: */ -_memmap_cacheattr_wb_base = 0x00000110; -_memmap_cacheattr_wt_base = 0x00000110; -_memmap_cacheattr_bp_base = 0x00000220; -_memmap_cacheattr_unused_mask = 0xFFFFF00F; -_memmap_cacheattr_wb_trapnull = 0x2222211F; -_memmap_cacheattr_wba_trapnull = 0x2222211F; -_memmap_cacheattr_wbna_trapnull = 0x2222211F; -_memmap_cacheattr_wt_trapnull = 0x2222211F; -_memmap_cacheattr_bp_trapnull = 0x2222222F; -_memmap_cacheattr_wb_strict = 0xFFFFF11F; -_memmap_cacheattr_wt_strict = 0xFFFFF11F; -_memmap_cacheattr_bp_strict = 0xFFFFF22F; -_memmap_cacheattr_wb_allvalid = 0x22222112; -_memmap_cacheattr_wt_allvalid = 0x22222112; -_memmap_cacheattr_bp_allvalid = 0x22222222; -PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wb_trapnull); -SECTIONS -{ - .dport0.rodata : ALIGN(4) - { - _dport0_rodata_start = ABSOLUTE(.); - *(.dport0.rodata) - *(.dport.rodata) - _dport0_rodata_end = ABSOLUTE(.); - } >dport0_0_seg :dport0_0_phdr - .dport0.literal : ALIGN(4) - { - _dport0_literal_start = ABSOLUTE(.); - *(.dport0.literal) - *(.dport.literal) - _dport0_literal_end = ABSOLUTE(.); - } >dport0_0_seg :dport0_0_phdr - .dport0.data : ALIGN(4) - { - _dport0_data_start = ABSOLUTE(.); - *(.dport0.data) - *(.dport.data) - _dport0_data_end = ABSOLUTE(.); - } >dport0_0_seg :dport0_0_phdr - .data : ALIGN(4) - { - _data_start = ABSOLUTE(.); - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - *(.data1) - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - *(.sdata2) - *(.sdata2.*) - *(.gnu.linkonce.s2.*) - *(.jcr) - . = ALIGN(4); - _Pri_3_HandlerAddress = ABSOLUTE(.); - _data_end = ABSOLUTE(.); - } >dram0_0_seg :dram0_0_phdr - .noinit : ALIGN(4) - { - *(.noinit) - } >dram0_0_seg :dram0_0_phdr - /* IRAM is split into .text and .text1 to allow for moving specific */ - /* functions into IRAM that would be matched by the irom0.text matcher */ - .text : ALIGN(4) - { - _stext = .; - _text_start = ABSOLUTE(.); - *(.UserEnter.text) - . = ALIGN(16); - *(.DebugExceptionVector.text) - . = ALIGN(16); - *(.NMIExceptionVector.text) - . = ALIGN(16); - *(.KernelExceptionVector.text) - LONG(0) - LONG(0) - LONG(0) - LONG(0) - . = ALIGN(16); - *(.UserExceptionVector.text) - LONG(0) - LONG(0) - LONG(0) - LONG(0) - . = ALIGN(16); - *(.DoubleExceptionVector.text) - LONG(0) - LONG(0) - LONG(0) - LONG(0) - . = ALIGN (16); - *(.entry.text) - *(.init.literal) - *(.init) - *(.text.app_entry*) /* The main startup code */ - *(.text.gdbstub* .text.gdb_init) /* Any GDB hooks */ - /* all functional callers are placed in IRAM (including SPI/IRQ callbacks/etc) here */ - *(.text._ZNKSt8functionIF*EE*) /* std::function::operator()() const */ - } >iram1_0_seg :iram1_0_phdr - .irom0.text : ALIGN(4) - { - _irom0_text_start = ABSOLUTE(.); - /* Stuff the CRC in well known symbols at a well known location */ - __crc_len = ABSOLUTE(.); - LONG(0x00000000); - __crc_val = ABSOLUTE(.); - LONG(0x00000000); - *(.ver_number) - *.c.o(.literal* .text*) - *.cpp.o(EXCLUDE_FILE (umm_malloc.cpp.o) .literal* EXCLUDE_FILE (umm_malloc.cpp.o) .text*) - *.cc.o(.literal* .text*) - *(.rodata._ZTV*) /* C++ vtables */ - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - /* C++ constructor and destructor tables, properly ordered: */ - __init_array_start = ABSOLUTE(.); - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __init_array_end = ABSOLUTE(.); - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - _bss_table_start = ABSOLUTE(.); - LONG(_bss_start) - LONG(_bss_end) - _bss_table_end = ABSOLUTE(.); - *libgcc.a:unwind-dw2.o(.literal .text .rodata .literal.* .text.* .rodata.*) - *libgcc.a:unwind-dw2-fde.o(.literal .text .rodata .literal.* .text.* .rodata.*) - *libc.a:(.literal .text .literal.* .text.*) - *libm.a:(.literal .text .literal.* .text.*) - *libgcc.a:_umoddi3.o(.literal .text) - *libgcc.a:_udivdi3.o(.literal .text) - *libgcc.a:_divsf3.o(.literal .text) - *libgcc.a:_fixsfsi.o(.literal .text) - *libgcc.a:_cmpdf2.o(.literal .text) - *libgcc.a:_cmpsf2.o(.literal .text) - *libstdc++.a:( .literal .text .literal.* .text.*) - *libstdc++-exc.a:( .literal .text .literal.* .text.*) - *libsmartconfig.a:(.literal .text .literal.* .text.*) - *liblwip_gcc.a:(.literal .text .literal.* .text.*) - *liblwip_src.a:(.literal .text .literal.* .text.*) - *liblwip2-536.a:(.literal .text .literal.* .text.*) - *liblwip2-1460.a:(.literal .text .literal.* .text.*) - *liblwip2-536-feat.a:(.literal .text .literal.* .text.*) - *liblwip2-1460-feat.a:(.literal .text .literal.* .text.*) - *liblwip6-536-feat.a:(.literal .text .literal.* .text.*) - *liblwip6-1460-feat.a:(.literal .text .literal.* .text.*) - *libbearssl.a:(.literal .text .literal.* .text.*) - *libat.a:(.literal.* .text.*) - *libcrypto.a:(.literal.* .text.*) - *libespnow.a:(.literal.* .text.*) - *libjson.a:(.literal.* .text.*) - *liblwip.a:(.literal.* .text.*) - *libmesh.a:(.literal.* .text.*) - *libnet80211.a:(.literal.* .text.*) - *libsmartconfig.a:(.literal.* .text.*) - *libssl.a:(.literal.* .text.*) - *libupgrade.a:(.literal.* .text.*) - *libwpa.a:(.literal.* .text.*) - *libwpa2.a:(.literal.* .text.*) - *libwps.a:(.literal.* .text.*) - *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*) - /* Constant strings in flash (PSTRs) */ - *(.irom0.pstr.*) - /* Inline flash strings PSTR() within templated code */ - *(.rodata._ZZ*__pstr__*) - /* __FUNCTION__ locals */ - *(.rodata._ZZ*__FUNCTION__) - *(.rodata._ZZ*__PRETTY_FUNCTION__) - *(.rodata._ZZ*__func__) - /* std::* exception strings, in their own section to allow string coalescing */ - *(.irom.exceptiontext .rodata.exceptiontext) - *(.rodata.*__exception_what__*) /* G++ seems to throw out templatized section attributes */ - /* c++ typeof IDs, etc. */ - *(.rodata._ZTIN* .rodata._ZTSN10* .rodata._ZTISt* .rodata._ZTSSt*) - /* Fundamental type info */ - *(.rodata._ZTIPKc .rodata._ZTIc .rodata._ZTIv .rodata._ZTSv .rodata._ZTSc .rodata._ZTSPKc .rodata._ZTSi .rodata._ZTIi) - . = ALIGN(4); - *(.gcc_except_table .gcc_except_table.*) - . = ALIGN(4); - __eh_frame = ABSOLUTE(.); - KEEP(*(.eh_frame)) - . = (. + 7) & ~ 3; /* Add a 0 entry to terminate the list */ - _irom0_text_end = ABSOLUTE(.); - _flash_code_end = ABSOLUTE(.); - } >irom0_0_seg :irom0_0_phdr - .text1 : ALIGN(4) - { - *(.literal .text .iram.literal .iram.text .iram.text.* .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) - *(.fini.literal) - *(.fini) - *(.gnu.version) - _text_end = ABSOLUTE(.); - _etext = .; - } >iram1_0_seg :iram1_0_phdr - .rodata : ALIGN(4) - { - _rodata_start = ABSOLUTE(.); - *(.sdk.version) - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r.*) - *(.rodata1) - __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); - *(.xt_except_table) - *(.gcc_except_table) - *(.gnu.linkonce.e.*) - *(.gnu.version_r) - *(.eh_frame) - . = ALIGN(4); - /* C++ exception handlers table: */ - __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); - *(.xt_except_desc) - *(.gnu.linkonce.h.*) - __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); - *(.xt_except_desc_end) - *(.dynamic) - *(.gnu.version_d) - _rodata_end = ABSOLUTE(.); - } >dram0_0_seg :dram0_0_phdr - .bss ALIGN(8) (NOLOAD) : ALIGN(4) - { - . = ALIGN (8); - _bss_start = ABSOLUTE(.); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - *(.sbss2) - *(.sbss2.*) - *(.gnu.linkonce.sb2.*) - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN (8); - _bss_end = ABSOLUTE(.); - _heap_start = ABSOLUTE(.); -/* _stack_sentry = ALIGN(0x8); */ - } >dram0_0_seg :dram0_0_bss_phdr -/* __stack = 0x3ffc8000; */ - .lit4 : ALIGN(4) - { - _lit4_start = ABSOLUTE(.); - *(*.lit4) - *(.lit4.*) - *(.gnu.linkonce.lit4.*) - _lit4_end = ABSOLUTE(.); - } >iram1_0_seg :iram1_0_phdr -} -/* get ROM code address */ -INCLUDE "../ld/eagle.rom.addr.v6.ld" diff --git a/Arduino/.pio/build/esp12e/lib049/LittleFS/LittleFS.cpp.o b/Arduino/.pio/build/esp12e/lib049/LittleFS/LittleFS.cpp.o deleted file mode 100644 index 7d1cc3c..0000000 Binary files a/Arduino/.pio/build/esp12e/lib049/LittleFS/LittleFS.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs.c.o b/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs.c.o deleted file mode 100644 index f7c7306..0000000 Binary files a/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs_util.c.o b/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs_util.c.o deleted file mode 100644 index c5d64d8..0000000 Binary files a/Arduino/.pio/build/esp12e/lib049/LittleFS/lfs_util.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib049/libLittleFS.a b/Arduino/.pio/build/esp12e/lib049/libLittleFS.a deleted file mode 100644 index 0018349..0000000 Binary files a/Arduino/.pio/build/esp12e/lib049/libLittleFS.a and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC.cpp.o deleted file mode 100644 index 8ca9e34..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC12.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC12.cpp.o deleted file mode 100644 index 2df42d9..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC12.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC16.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC16.cpp.o deleted file mode 100644 index 16d822a..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC16.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC32.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC32.cpp.o deleted file mode 100644 index 73baec1..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC32.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC64.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC64.cpp.o deleted file mode 100644 index 07fdd0a..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC64.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC8.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CRC8.cpp.o deleted file mode 100644 index d576b32..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CRC8.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/CrcFastReverse.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/CrcFastReverse.cpp.o deleted file mode 100644 index 5ddc3a2..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/CrcFastReverse.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/CRC/FastCRC32.cpp.o b/Arduino/.pio/build/esp12e/lib13e/CRC/FastCRC32.cpp.o deleted file mode 100644 index bab729a..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/CRC/FastCRC32.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib13e/libCRC.a b/Arduino/.pio/build/esp12e/lib13e/libCRC.a deleted file mode 100644 index b6255c5..0000000 Binary files a/Arduino/.pio/build/esp12e/lib13e/libCRC.a and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib975/Servo/Servo.cpp.o b/Arduino/.pio/build/esp12e/lib975/Servo/Servo.cpp.o deleted file mode 100644 index 587c9dd..0000000 Binary files a/Arduino/.pio/build/esp12e/lib975/Servo/Servo.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/lib975/libServo.a b/Arduino/.pio/build/esp12e/lib975/libServo.a deleted file mode 100644 index ce54040..0000000 Binary files a/Arduino/.pio/build/esp12e/lib975/libServo.a and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libFrameworkArduino.a b/Arduino/.pio/build/esp12e/libFrameworkArduino.a deleted file mode 100644 index cdc8975..0000000 Binary files a/Arduino/.pio/build/esp12e/libFrameworkArduino.a and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libFrameworkArduinoVariant.a b/Arduino/.pio/build/esp12e/libFrameworkArduinoVariant.a deleted file mode 100644 index 8b277f0..0000000 --- a/Arduino/.pio/build/esp12e/libFrameworkArduinoVariant.a +++ /dev/null @@ -1 +0,0 @@ -! diff --git a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/Adafruit_NeoPixel.cpp.o b/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/Adafruit_NeoPixel.cpp.o deleted file mode 100644 index afaa12c..0000000 Binary files a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/Adafruit_NeoPixel.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp.c.o b/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp.c.o deleted file mode 100644 index 7216152..0000000 Binary files a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp8266.c.o b/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp8266.c.o deleted file mode 100644 index 690d1b9..0000000 Binary files a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/esp8266.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/kendyte_k210.c.o b/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/kendyte_k210.c.o deleted file mode 100644 index 246c2a3..0000000 Binary files a/Arduino/.pio/build/esp12e/libd70/Adafruit NeoPixel/kendyte_k210.c.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/libd70/libAdafruit NeoPixel.a b/Arduino/.pio/build/esp12e/libd70/libAdafruit NeoPixel.a deleted file mode 100644 index 5ea1ce8..0000000 Binary files a/Arduino/.pio/build/esp12e/libd70/libAdafruit NeoPixel.a and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/File.cpp.o b/Arduino/.pio/build/esp12e/src/File.cpp.o deleted file mode 100644 index b7225c6..0000000 Binary files a/Arduino/.pio/build/esp12e/src/File.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/Motor.cpp.o b/Arduino/.pio/build/esp12e/src/Motor.cpp.o deleted file mode 100644 index 4866ceb..0000000 Binary files a/Arduino/.pio/build/esp12e/src/Motor.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/ServoMotor.cpp.o b/Arduino/.pio/build/esp12e/src/ServoMotor.cpp.o deleted file mode 100644 index f2d183d..0000000 Binary files a/Arduino/.pio/build/esp12e/src/ServoMotor.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/dataPacket.cpp.o b/Arduino/.pio/build/esp12e/src/dataPacket.cpp.o deleted file mode 100644 index 876f5de..0000000 Binary files a/Arduino/.pio/build/esp12e/src/dataPacket.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/led.cpp.o b/Arduino/.pio/build/esp12e/src/led.cpp.o deleted file mode 100644 index 0cf3e38..0000000 Binary files a/Arduino/.pio/build/esp12e/src/led.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/main.cpp.o b/Arduino/.pio/build/esp12e/src/main.cpp.o deleted file mode 100644 index 4186ec9..0000000 Binary files a/Arduino/.pio/build/esp12e/src/main.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/esp12e/src/processData.cpp.o b/Arduino/.pio/build/esp12e/src/processData.cpp.o deleted file mode 100644 index b8d31a8..0000000 Binary files a/Arduino/.pio/build/esp12e/src/processData.cpp.o and /dev/null differ diff --git a/Arduino/.pio/build/project.checksum b/Arduino/.pio/build/project.checksum index b1ef2a0..041b675 100644 --- a/Arduino/.pio/build/project.checksum +++ b/Arduino/.pio/build/project.checksum @@ -1 +1 @@ -aae944ca046edc15e5015c50ba39c6692d68710b \ No newline at end of file +a97bc1fbd540ec81ca4e78e3eac7ceb13d59e415 \ No newline at end of file diff --git a/Arduino/.vscode/extensions.json b/Arduino/.vscode/extensions.json new file mode 100644 index 0000000..080e70d --- /dev/null +++ b/Arduino/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/Arduino/include/File.h b/Arduino/include/File.h index f223395..c744281 100644 --- a/Arduino/include/File.h +++ b/Arduino/include/File.h @@ -5,7 +5,10 @@ void WriteByteIntoConfig(const byte *content, uint8_t contentLength); void ReadContentFromConfig(byte *content, size_t length); // 写入模式配置文件 -void WriteModeConfig(int modeNum); + +void WriteModeConfig(uint8_t modeNum); // 读取模式配置文件 -int ReadModeFromConfig(); \ No newline at end of file +uint8_t ReadModeFromConfig(); +bool formatFS(); + diff --git a/Arduino/include/Motor.h b/Arduino/include/Motor.h index a13b23c..3fa1047 100644 --- a/Arduino/include/Motor.h +++ b/Arduino/include/Motor.h @@ -4,8 +4,8 @@ class Motor { private: - int pin1; - int pin2; + uint8_t pin1; + uint8_t pin2; bool isStop = true; String state = "停止"; unsigned long startTime = 0; @@ -13,7 +13,9 @@ class Motor bool banMotor = false; public: - Motor(int pin1, int pin2); + + Motor(uint8_t pin1, uint8_t pin2); + void forward(unsigned long); void backforward(unsigned long); void stop(); diff --git a/Arduino/include/dataPacket.h b/Arduino/include/dataPacket.h index bcf3f5a..586890b 100644 --- a/Arduino/include/dataPacket.h +++ b/Arduino/include/dataPacket.h @@ -4,10 +4,12 @@ #include "led.h" #pragma once -class DataPacket { +class DataPacket +{ private: CRC8 crc8; CRC16 crc16; + public: uint8_t index; // 索引 int8_t sequenceNumber; // 序号 @@ -20,8 +22,8 @@ class DataPacket { uint8_t totalHighCRC; // 总高检验 uint8_t contentlength = 0; // 内容长度[作索引用] - DataPacket(); // 构造函数声明 + DataPacket(); // 构造函数声明 bool headCheck(); bool totalCheck(); - void sendPacket(bool ISIO2OUT = false); + void sendPacket(bool ISIO2OUT = false); }; \ No newline at end of file diff --git a/Arduino/include/modeInfo.h b/Arduino/include/modeInfo.h index a40237a..184f188 100644 --- a/Arduino/include/modeInfo.h +++ b/Arduino/include/modeInfo.h @@ -1,10 +1,13 @@ -int getModeStatus(); -void setModeStatus(int modeNum); +uint8_t getBackPullTime(); + +void setBackPullTime(uint8_t modeNum); // void modeLEDChange(bool status); -void modeDelay(int modeNum); +uint16_t backPullDelay(uint8_t modeNum); + +void modeLEDSelect(uint8_t modeNum); +void singleFlashLED(); -void modeLEDSelect(int modeNum); diff --git a/Arduino/include/newDelay.h b/Arduino/include/newDelay.h new file mode 100644 index 0000000..21d089e --- /dev/null +++ b/Arduino/include/newDelay.h @@ -0,0 +1,24 @@ +#ifndef NEWDELAY_H +#define NEWDELAY_H + +#include + +typedef void (*CallbackFunction)(); + +class NewDelay +{ +public: + NewDelay() : isDelayOver(false), startTime(0), delayDuration(0), callback(nullptr) {} + + void setDelay(unsigned long delayMs, CallbackFunction callbackFunction); + void checkDelay(); + +private: + bool isDelayOver; + + unsigned long startTime; + unsigned long delayDuration; + CallbackFunction callback; +}; + +#endif // NEWDELAY_H \ No newline at end of file diff --git a/Arduino/include/processData.h b/Arduino/include/processData.h index 13ba932..98f2fd0 100644 --- a/Arduino/include/processData.h +++ b/Arduino/include/processData.h @@ -6,4 +6,7 @@ extern Motor mc; extern ServoMotor sv; extern String FilamentState; -void processData(DataPacket data); \ No newline at end of file + +extern bool needBackStop; +void processData(DataPacket data); +void backStop(); diff --git a/Arduino/include/webServer.h b/Arduino/include/webServer.h new file mode 100644 index 0000000..86fac35 --- /dev/null +++ b/Arduino/include/webServer.h @@ -0,0 +1,8 @@ +#include +#include +#include "modeInfo.h" + +void recWebServer(); +extern const char *version; +extern uint8_t backStopTime; +extern AsyncWebServer server; \ No newline at end of file diff --git a/Arduino/platformio.ini b/Arduino/platformio.ini index 7070e29..41f0dd2 100644 --- a/Arduino/platformio.ini +++ b/Arduino/platformio.ini @@ -16,8 +16,16 @@ lib_deps = robtillaart/CRC@^1.0.3 adafruit/Adafruit NeoPixel@^1.12.2 arminjo/ServoEasing@^3.2.1 + + mathieucarbou/ESPAsyncWebServer@^3.3.23 + ayushsharma82/ElegantOTA @ ^3.1.6 + upload_speed = 115200 monitor_speed = 115200 +build_flags= -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305 +board_build.filesystem = littlefs +board_build.ldscript = eagle.flash.4m1m.ld + [env:nodemcu] platform = espressif8266 @@ -27,5 +35,13 @@ lib_deps = robtillaart/CRC@^1.0.3 adafruit/Adafruit NeoPixel@^1.12.2 arminjo/ServoEasing@^3.2.1 + + mathieucarbou/ESPAsyncWebServer@^3.3.23 + ayushsharma82/ElegantOTA @ ^3.1.6 + upload_speed = 115200 -monitor_speed = 115200 \ No newline at end of file +monitor_speed = 115200 +build_flags= -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305 +board_build.filesystem = littlefs +board_build.ldscript = eagle.flash.4m1m.ld + diff --git a/Arduino/src/File.cpp b/Arduino/src/File.cpp index d8e4d13..263ef83 100644 --- a/Arduino/src/File.cpp +++ b/Arduino/src/File.cpp @@ -15,15 +15,26 @@ void ReadContentFromConfig(byte *content, size_t length) } // 写入模式配置文件 -void WriteModeConfig(int modeNum) + +void WriteModeConfig(uint8_t modeNum) { File file = LittleFS.open("/config_mod.bin", "w"); // Serial.println("WriteModeConfig:" + String((uint8_t)status)); - file.write((uint8_t)modeNum); + if (modeNum < 0) + { + modeNum = 0; + } + else if (modeNum > 255) + { + modeNum = 255; + } + + file.write(modeNum); file.close(); } // 读取模式配置文件 -int ReadModeFromConfig() +uint8_t ReadModeFromConfig() + { File file = LittleFS.open("/config_mod.bin", "r"); if (file) @@ -34,9 +45,14 @@ int ReadModeFromConfig() // Serial.println("ReadModeFromConfigbytesRead:" + String(bytesRead)); file.close(); - return int(buffer); + + return uint8_t(buffer); } - WriteModeConfig(1); + WriteModeConfig(5); file.close(); - return 1; -} \ No newline at end of file + return 5; +} + +bool formatFS() +{ + return LittleFS.format(); diff --git a/Arduino/src/Motor.cpp b/Arduino/src/Motor.cpp index 6af0177..46c2f43 100644 --- a/Arduino/src/Motor.cpp +++ b/Arduino/src/Motor.cpp @@ -1,6 +1,8 @@ #include "Motor.h" -Motor::Motor(int pin1, int pin2) + +Motor::Motor(uint8_t pin1, uint8_t pin2) + { this->pin1 = pin1; this->pin2 = pin2; diff --git a/Arduino/src/dataPacket.cpp b/Arduino/src/dataPacket.cpp index 9165e34..4e907bf 100644 --- a/Arduino/src/dataPacket.cpp +++ b/Arduino/src/dataPacket.cpp @@ -1,69 +1,77 @@ #include "dataPacket.h" -DataPacket::DataPacket() - : crc8(0x39, 0x66, 0x00, false, false), - crc16(0x1021, 0x913D, 0x0000, false, false) +DataPacket::DataPacket() + : crc8(0x39, 0x66, 0x00, false, false), + crc16(0x1021, 0x913D, 0x0000, false, false) { } -bool DataPacket::headCheck(){ - byte head[] = {0x3D,sequenceNumber,address,length}; +bool DataPacket::headCheck() +{ + byte head[] = {0x3D, sequenceNumber, address, length}; crc8.restart(); - crc8.add(head,4); + crc8.add(head, 4); uint8_t result = crc8.calc(); return (result == headCRC); } -bool DataPacket::totalCheck(){ - byte* packet = new byte[length - 2]; +bool DataPacket::totalCheck() +{ + byte packet[length - 2]; packet[0] = 0x3D; packet[1] = sequenceNumber; packet[2] = address; packet[3] = length; packet[4] = headCRC; packet[5] = commandType; - memcpy(packet + 6,content,length - 8); + memcpy(packet + 6, content, length - 8); crc16.restart(); crc16.add(packet, length - 2); uint16_t totalCRC = crc16.calc(); - uint8_t lowCRC = totalCRC & 0xFF; // 低字节 + uint8_t lowCRC = totalCRC & 0xFF; // 低字节 uint8_t highCRC = (totalCRC >> 8) & 0xFF; // 高字节 - delete[] packet; return (lowCRC == totalLowCRC and highCRC == totalHighCRC); } -void DataPacket::sendPacket(bool ISIO2OUT){ - byte head[] = {0x3D,sequenceNumber,address,length}; +void DataPacket::sendPacket(bool ISIO2OUT) +{ + byte head[] = {0x3D, sequenceNumber, address, length}; crc8.restart(); - crc8.add(head,4); + crc8.add(head, 4); headCRC = crc8.calc(); - byte* packet = new byte[length]; + + // 使用栈分配来减少动态内存分配 + byte packet[length]; packet[0] = 0x3D; packet[1] = sequenceNumber; packet[2] = address; packet[3] = length; packet[4] = headCRC; packet[5] = commandType; - memcpy(packet + 6,content,length - 8); + memcpy(packet + 6, content, length - 8); + crc16.restart(); crc16.add(packet, length - 2); uint16_t totalCRC = crc16.calc(); - totalLowCRC = totalCRC & 0xFF; // 低字节 + totalLowCRC = totalCRC & 0xFF; // 低字节 totalHighCRC = (totalCRC >> 8) & 0xFF; // 高字节 packet[length - 2] = totalLowCRC; packet[length - 1] = totalHighCRC; - if (ISIO2OUT){ - pinMode(2,SPECIAL); + + if (ISIO2OUT) + { + pinMode(2, SPECIAL); Serial1.write(packet, length); - //delay(1); Serial1.flush(); - pinMode(2,INPUT); - ledPC(1,0,255,0); - }else{ + pinMode(2, INPUT); + + ledPC(1, 0, 255, 0); + } + else + { Serial.write(packet, length); - ledPC(1,0,0,255); - } - delay(1); - delete[] packet; - ledPC(1,0,0,0); -} \ No newline at end of file + ledPC(1, 0, 0, 255); + } + + ledPC(1, 0, 0, 0); +} diff --git a/Arduino/src/main.cpp b/Arduino/src/main.cpp index 4dedde6..94fd76e 100644 --- a/Arduino/src/main.cpp +++ b/Arduino/src/main.cpp @@ -1,12 +1,31 @@ #include +#include +#include +#include + #include "dataPacket.h" #include "processData.h" #include "ServoMotor.h" #include "Motor.h" -#include #include #include "led.h" #include "modeInfo.h" + +#include "newDelay.h" +#include "webServer.h" +// ota相关 +IPAddress local_IP(10, 10, 0, 1); // 设置本地IP地址 +IPAddress gateway(10, 10, 0, 1); // 设置网关IP地址，通常和本地IP相同 +IPAddress subnet(255, 255, 255, 0); // 设置子网掩码 +const char *password = "1234567890"; // 热点密码 +unsigned long SysStartTime; // 系统启动时间 +bool serverRunning = true; // 是否开启服务 +const char *version = "1.4.0.0.7"; + +// 1修复amcu发包异常导致的断料状态错误（错误发送送出结束，和回抽结束） + +// 业务相关 + DataPacket datapacket; ServoMotor sv(13); // 构建舵机对象(选择13引脚为pwm输出引脚) Motor mc(4, 5); // 构建电机对象(选择4和5引脚控制电机驱动) @@ -14,37 +33,49 @@ Adafruit_NeoPixel leds(3, 12, NEO_GRB + NEO_KHZ800); // 构建leds对象(3个led unsigned int FilamentIoPin = A0; // 断料检测引脚(ADC=>A0) String FilamentState = "none"; // 断料状态 bool IsFPinHigh; // ADC是否高电平 -int modeNum = 1; // 默认模式1，5s回抽 -unsigned long LastBootPressTime; // 上一次Boot按键被按下的时间 -bool AllowBootPress = true; // 允许按下Boot按键 -bool FirstBootPress = false; // 首次按下Boot按键 + +// uint8_t modeNum = 1; // 默认模式1，5s回抽 +uint8_t backStopTime = 5; // 退料时间 单位秒 +unsigned long LastBootPressTime; // 上一次Boot按键被按下的时间 +bool AllowBootPress = true; // 允许按下Boot按键 +bool FirstBootPress = false; // 首次按下Boot按键 +NewDelay backDelay; // 回抽停止延时对象 +bool lastBackStopStatus = false; void FilamentChange(bool ToStateIsHigh); -void setup() -{ +// void bootPressRun() +// { +// // *** boot切换相关 +// if (digitalRead(0) == LOW) +// { +// unsigned long nowTime = millis(); +// if (!FirstBootPress) +// { +// LastBootPressTime = nowTime; +// FirstBootPress = true; +// } +// if ((nowTime - LastBootPressTime) > 2000 && AllowBootPress) +// { // 大于2s就是切换 +// modeNum++; +// if (modeNum > 4) +// { +// modeNum = 0; +// } +// setBackPullTime(modeNum); +// modeLEDSelect(modeNum); +// AllowBootPress = false; +// } +// } +// else +// { +// FirstBootPress = false; +// AllowBootPress = true; +// } +// } - Serial.begin(115200, SERIAL_8E1); - Serial1.begin(115200, SERIAL_8E1); - LittleFS.begin(); - leds.begin(); - IsFPinHigh = (analogRead(A0) > 1000); - if (IsFPinHigh) - { - FilamentState = "exist"; - } - else - { - FilamentState = "inexist"; - } - leds.setBrightness(100); - leds.clear(); - leds.show(); - modeNum = getModeStatus(); // 获取保存的模式编号 - modeLEDSelect(modeNum); -} +void run() -void loop() { if ((analogRead(A0) > 1000) != IsFPinHigh) { @@ -52,37 +83,6 @@ void loop() IsFPinHigh = not IsFPinHigh; } - if (digitalRead(0) == LOW) - { - while (digitalRead(0) == LOW) - { - delay(10); - unsigned long nowTime = millis(); - if (!FirstBootPress) - { - LastBootPressTime = nowTime; - FirstBootPress = true; - } - if ((nowTime - LastBootPressTime) > 2000 && AllowBootPress) - { // 大于2s就是切换 - // Serial.println("双击BOOT"); - modeNum++; - if (modeNum > 4) - { - modeNum = 0; - } - setModeStatus(modeNum); - modeLEDSelect(modeNum); - AllowBootPress = false; - } - } - } - else - { - FirstBootPress = false; - AllowBootPress = true; - } - if (datapacket.index == 0 and Serial.read() == 0x3D) { // Serial.println("帧头"); @@ -191,48 +191,156 @@ void loop() void FilamentChange(bool ToStateIsHigh) { - if (modeNum != 4) + + if (backStopTime != 255) { if (ToStateIsHigh) { - // 低变高-无变有 FilamentState = "exist"; } - else if (not ToStateIsHigh) + else if (!ToStateIsHigh) { - // 高变低-有变无 + FilamentState = "inexist"; } } else - { + + { // 低变高，无变有 if (ToStateIsHigh) { - - // 低变高-无变有 - if (FilamentState == "none" or FilamentState == "inexist") + // 之前是空或者无料，无变有 + if (FilamentState == "none" || FilamentState == "inexist") { FilamentState = "exist"; } + // 之前电机运转，无变有 + else if (FilamentState == "busy") { mc.stop(); sv.pull(); FilamentState = "exist"; } + + } + // 高变低，有变无 + else if (!ToStateIsHigh) + { // 之前是空或者有料，有变无 + mc.forward(300000); + unsigned long start = millis(); + while (millis() - start < 20) + { + } + mc.stop(); + sv.pull(); + FilamentState = "inexist"; + // if (FilamentState == "none" || FilamentState == "exist") + // { + + // FilamentState = "inexist"; + // } + // // 之前电机运转，有变无 + // else if (FilamentState == "busy") + // { + + // mc.forward(300000); + // unsigned long start = millis(); + // while (millis() - start < 20) + // { + // } + // mc.stop(); + // sv.pull(); + // FilamentState = "inexist"; + // } + } + } +} + +void setup() +{ + Serial.begin(115200, SERIAL_8E1); + Serial1.begin(115200, SERIAL_8E1); + LittleFS.begin(); + leds.begin(); + IsFPinHigh = (analogRead(A0) > 1000); + if (IsFPinHigh) + { + FilamentState = "exist"; + } + else + { + FilamentState = "inexist"; + } + leds.setBrightness(100); + leds.clear(); + leds.show(); + backStopTime = getBackPullTime(); + // 热点相关 + byte mac[6]; + WiFi.macAddress(mac); + char macStr[18]; + sprintf(macStr, "APAMS-%02X%02X%02X", mac[3], mac[4], mac[5]); + WiFi.softAPConfig(local_IP, gateway, subnet); + WiFi.softAP(macStr, password); + recWebServer(); + ElegantOTA.begin(&server); + ElegantOTA.setAutoReboot(true); + + SysStartTime = millis(); + + server.begin(); + + // 检查5秒内是否收到0x3D + unsigned long startTime = millis(); + bool receivedChar = false; + + while (millis() - startTime < 5000) + { // 5秒内 + if (Serial.available() > 0) + { + if (Serial.read() == 0x3D) + { + receivedChar = true; + break; + + } } - else if (not ToStateIsHigh) + } + + if (!receivedChar) + { + // 进入OTA模式 + while (true) { + ElegantOTA.loop(); - // 高变低-有变无 - if (FilamentState == "none" or FilamentState == "exist") + if (WiFi.softAPgetStationNum() > 0) { - FilamentState = "inexist"; + ledPC(0, 0, 255, 0); } - else if (FilamentState == "busy") + else { - mc.forward(300000); + ledPC(0, 0, 0, 255); } + // bootPressRun(); + delay(1); + } + } +} + +void loop() +{ + if (needBackStop != lastBackStopStatus) + { + lastBackStopStatus = needBackStop; + if (needBackStop) + { + backDelay.setDelay(backPullDelay(backStopTime), backStop); } } + + backDelay.checkDelay(); + + run(); } \ No newline at end of file diff --git a/Arduino/src/modeInfo.cpp b/Arduino/src/modeInfo.cpp index d9321db..b1326e1 100644 --- a/Arduino/src/modeInfo.cpp +++ b/Arduino/src/modeInfo.cpp @@ -1,75 +1,71 @@ #include "File.h" #include "led.h" -int getModeStatus() + +#include "modeInfo.h" +uint8_t getBackPullTime() + { return ReadModeFromConfig(); } -void setModeStatus(int modeNum) + +void setBackPullTime(uint8_t modeNum) + { WriteModeConfig(modeNum); } void singleFlashLED() { ledPC(2, 200, 200, 200); - delay(200); + + delay(50); ledPC(2, 0, 0, 0); - delay(200); + delay(50); ledPC(2, 200, 200, 200); - delay(200); + delay(50); + ledPC(2, 0, 0, 0); } -enum modeType -{ - tow = 0, - five = 1, - ten = 2, - twenty_fifth = 3, - end = 4 -}; +// enum modeType +// { +// tow = 0, +// five = 1, +// ten = 2, +// twenty_fifth = 3, +// end = 4 +// }; + +// void modeLEDSelect(uint8_t modeNum) +// { +// switch (modeNum) +// { +// case tow: +// singleFlashLED(); +// ledPC(2, 255, 128, 0); // 橙色 +// break; +// case five: +// singleFlashLED(); +// ledPC(2, 200, 200, 200); // 白色 +// break; +// case ten: +// singleFlashLED(); +// ledPC(2, 128, 255, 0); // 绿色 +// break; +// case twenty_fifth: +// singleFlashLED(); +// ledPC(2, 127, 0, 255); // 紫色 +// break; +// case end: +// singleFlashLED(); +// ledPC(2, 0, 0, 0); // 无色 +// break; +// } +// } +// 返回延迟时间 + +uint16_t backPullDelay(uint8_t modeNum) -void modeLEDSelect(int modeNum) { - switch (modeNum) - { - case tow: - singleFlashLED(); - ledPC(2, 255, 128, 0); // 橙色 - break; - case five: - singleFlashLED(); - ledPC(2, 200, 200, 200); // 白色 - break; - case ten: - singleFlashLED(); - ledPC(2, 128, 255, 0); // 绿色 - break; - case twenty_fifth: - singleFlashLED(); - ledPC(2, 127, 0, 255); // 紫色 - break; - case end: - singleFlashLED(); - ledPC(2, 0, 0, 0); // 无色 - break; - } + return modeNum * 1000; } -void modeDelay(int modeNum) -{ - switch (modeNum) - { - case tow: - delay(2000); - break; - case five: - delay(5000); - break; - case ten: - delay(10000); - break; - case twenty_fifth: - delay(25000); - break; - } -} \ No newline at end of file diff --git a/Arduino/src/newDelay.cpp b/Arduino/src/newDelay.cpp new file mode 100644 index 0000000..431f151 --- /dev/null +++ b/Arduino/src/newDelay.cpp @@ -0,0 +1,21 @@ +#include "newDelay.h" + +void NewDelay::setDelay(unsigned long delayMs, CallbackFunction callbackFunction) +{ + startTime = millis(); + delayDuration = delayMs; + callback = callbackFunction; + isDelayOver = false; +} + +void NewDelay::checkDelay() +{ + if (!isDelayOver && millis() - startTime >= delayDuration) + { + if (callback != nullptr) + { + callback(); + isDelayOver = true; + } + } +} \ No newline at end of file diff --git a/Arduino/src/processData.cpp b/Arduino/src/processData.cpp index 631f03e..717ef21 100644 --- a/Arduino/src/processData.cpp +++ b/Arduino/src/processData.cpp @@ -1,6 +1,9 @@ #include "processData.h" #include "File.h" #include "modeInfo.h" + +bool needBackStop = false; // 需要执行回抽停止 + void processData(DataPacket data) { if (data.sequenceNumber >= data.address) @@ -11,21 +14,26 @@ void processData(DataPacket data) byte originContent[512]; memcpy(originContent, data.content, 512); // 复制内容 + switch (data.commandType) { case 0x00: data.length = 0x09; data.commandType = 0x80; if (FilamentState == "inexist") + { + ledPC(2, 255, 128, 0); // 橙色 data.content[0] = 0x0F; } else if (FilamentState == "exist") { + ledPC(2, 128, 255, 0); // 绿色 data.content[0] = 0xF0; } else if (FilamentState == "busy") { + ledPC(2, 127, 0, 255); // 紫色 data.content[0] = 0xF1; } data.sendPacket(true); @@ -38,8 +46,8 @@ void processData(DataPacket data) mc.forward(300000); // 电机运行5分钟超时，防止过热(什么进料需要五分钟) FilamentState = "busy"; break; - case 0x0F: // 抽回 - delay(1500); // 延迟抽回1.5s + case 0x0F: // 抽回 + sv.push(); mc.backforward(300000); // 电机运行5分钟超时，防止过热(什么退料需要五分钟) FilamentState = "busy"; @@ -48,20 +56,25 @@ void processData(DataPacket data) sv.pull(); mc.stop(); mc.setBanMotor(false); - FilamentState = "exist"; + if (FilamentState == "busy") + { + FilamentState = "exist"; + } break; case 0x03: // 抽回结束 - int nowModeNum = getModeStatus(); - if (nowModeNum != 4) + mc.setBanMotor(false); + uint8_t BackPullTime = getBackPullTime(); + if (BackPullTime != 255) { - // delay(5000); // 回抽5秒 - modeDelay(nowModeNum); - sv.pull(); - mc.stop(); - mc.setBanMotor(false); - FilamentState = "exist"; - break; + needBackStop = true; + } + else + { + needBackStop = false; } + + break; + } data.length = 0x09; @@ -93,4 +106,13 @@ void processData(DataPacket data) data.sequenceNumber += 1; data.sendPacket(); } +} + +// 回抽停止回调方法 +void backStop() +{ + sv.pull(); + mc.stop(); + mc.setBanMotor(false); + needBackStop = false; } \ No newline at end of file diff --git a/Arduino/src/webServer.cpp b/Arduino/src/webServer.cpp new file mode 100644 index 0000000..620836f --- /dev/null +++ b/Arduino/src/webServer.cpp @@ -0,0 +1,59 @@ +#include "webServer.h" +#include "File.h" +AsyncWebServer server(80); + +const char jsContent[] PROGMEM = R"rawliteral( +(function(){const f=document.createElement("link").relList;if(f&&f.supports&&f.supports("modulepreload"))return;for(const a of document.querySelectorAll('link[rel="modulepreload"]'))d(a);new MutationObserver((a)=>{for(const c of a)if(c.type==="childList")for(const i of c.addedNodes)i.tagName==="LINK"&&i.rel==="modulepreload"&&d(i)}).observe(document,{childList:!0,subtree:!0,});function s(a){const c={};return(a.integrity&&(c.integrity=a.integrity),a.referrerPolicy&&(c.referrerPolicy=a.referrerPolicy),a.crossOrigin==="use-credentials"?(c.credentials="include"):a.crossOrigin==="anonymous"?(c.credentials="omit"):(c.credentials="same-origin"),c)}function d(a){if(a.ep)return;a.ep=!0;const c=s(a);fetch(a.href,c)}})();function A(l){return l&&l.__esModule&&Object.prototype.hasOwnProperty.call(l,"default")?l.default:l}var L={exports:{},},x={exports:{},};(function(){var l="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f={rotl:function(s,d){return(s<>>(32-d))},rotr:function(s,d){return(s<<(32-d))|(s>>>d)},endian:function(s){if(s.constructor==Number)return(f.rotl(s,8)&16711935)|(f.rotl(s,24)&4278255360);for(var d=0;d0;s--)d.push(Math.floor(Math.random()*256));return d},bytesToWords:function(s){for(var d=[],a=0,c=0;a>>5]|=s[a]<<(24-(c%32));return d},wordsToBytes:function(s){for(var d=[],a=0;a>>5]>>>(24-(a%32)))&255);return d},bytesToHex:function(s){for(var d=[],a=0;a>>4).toString(16)),d.push((s[a]&15).toString(16));return d.join("")},hexToBytes:function(s){for(var d=[],a=0;a>>(6*(3-i)))&63)):d.push("=");return d.join("")},base64ToBytes:function(s){s=s.replace(/[^A-Z0-9+\/]/gi,"");for(var d=[],a=0,c=0;a>>(6-c*2)),);return d},};x.exports=f})();var H=x.exports,F={utf8:{stringToBytes:function(l){return F.bin.stringToBytes(unescape(encodeURIComponent(l)))},bytesToString:function(l){return decodeURIComponent(escape(F.bin.bytesToString(l)))},},bin:{stringToBytes:function(l){for(var f=[],s=0;s>>24))&16711935)|(((r[u]<<24)|(r[u]>>>8))&4278255360);(r[p>>>5]|=128<>>9)<<4)+14]=p);for(var m=a._ff,g=a._gg,h=a._hh,y=a._ii,u=0;u>>0),(e=(e+S)>>>0),(o=(o+k)>>>0),(t=(t+_)>>>0)}return l.endian([n,e,o,t])};(a._ff=function(c,i,r,p,n,e,o){var t=c+((i&r)|(~i&p))+(n>>>0)+o;return((t<>>(32-e)))+i}),(a._gg=function(c,i,r,p,n,e,o){var t=c+((i&p)|(r&~p))+(n>>>0)+o;return((t<>>(32-e)))+i}),(a._hh=function(c,i,r,p,n,e,o){var t=c+(i^r^p)+(n>>>0)+o;return((t<>>(32-e)))+i}),(a._ii=function(c,i,r,p,n,e,o){var t=c+(r^(i|~p))+(n>>>0)+o;return((t<>>(32-e)))+i}),(a._blocksize=16),(a._digestsize=16),(L.exports=function(c,i){if(c==null)throw new Error("Illegal argument "+c);var r=l.wordsToBytes(a(c,i));return i&&i.asBytes?r:i&&i.asString?d.bytesToString(r):l.bytesToHex(r)})})();var U=L.exports;const R=A(U),v=(l)=>{document.getElementById(l).classList.remove("hidden")},B=(l)=>{document.getElementById(l).classList.add("hidden")};(D=async(l)=>new Promise((f,s)=>{let d="",a=new FileReader();(a.onload=function(c){(d=R(c.target.result)),f(d)}),a.readAsArrayBuffer(l)})),(N=async(l)=>{B("uploadColumn"),v("progressColumn");let f="fr";try{let s=await D(l);const d=await fetch(`/ota/start?mode=${f}&hash=${s}`);if(!d.ok)throw new Error("Start OTA process failed");const a=await d.text();console.log("Start OTA response:",a);const c=new FormData();let i=new XMLHttpRequest();i.open("POST","/ota/upload"),(i.onreadystatechange=function(){if(i.readyState==4)if(i.status==200)B("progressColumn"),v("successColumn");else if(i.status==400){B("progressColumn"),v("errorColumn");let r=i.responseText}else B("progressColumn"),v("errorColumn")}),c.append("file",l,l.name),i.send(c)}catch(s){B("progressColumn"),v("errorColumn")}}),(V=(l)=>l.length>1&&!multiple?(alert("一次只能上传一个bin文件"),!1):l[0].name.split(".").pop()!="bin"?(alert("只能上传bin文件"),!1):!0);var q=document.getElementById("uploadButton"),$=document.getElementById("fileInput");q.addEventListener("click",function(l){l.preventDefault(),$.click()});function z(l){if(!V(l))return!1;N(l[0])}function G(){window.location.reload()}window.onFileInput=z;window.resetView=G;function callSetBackPullTime(){var inputElement=document.getElementById("backPullTimeInput");var backPullTime=parseInt(inputElement.value,10);if(isNaN(backPullTime)||backPullTime<0||backPullTime>255){alert("请输入0到255之间的数值");return}var url="/setBackPullTimeArgs?number="+encodeURIComponent(backPullTime);fetch(url,{method:"GET",}).then((response)=>response.text()).then((data)=>{if(data==="OK"){window.location.reload()}alert(data)}).catch((error)=>{console.error("Error:",error)})}function formatFS(){var url="/formatFS";fetch(url,{method:"GET",}).then((response)=>response.text()).then((data)=>{alert(data)}).catch((error)=>{console.error("Error:",error)})}function uploadFile(event){event.preventDefault();var formData=new FormData(document.getElementById("uploadForm"));var file=formData.get("file");if(!file){alert("请选择一个文件");return}const reader=new FileReader();reader.onload=async function(e){const arrayBuffer=e.target.result;const hash=R(arrayBuffer);const startUrl=`/ota/start?mode=fr&hash=${hash}`;try{const startResponse=await fetch(startUrl,{method:"GET",});if(!startResponse.ok){throw new Error("OTA进程失败");}const startData=await startResponse.text();console.log("Start OTA response:",startData);const uploadResponse=await fetch("/ota/upload",{method:"POST",body:formData,});const uploadData=await uploadResponse.text();document.getElementById("uploadResult").innerText=uploadData}catch(error){console.error("Error:",error);document.getElementById("uploadResult").innerText="上传失败"}finally{document.querySelector('#uploadForm button[type="submit"]').disabled=false}};document.querySelector('#uploadForm button[type="submit"]').disabled=true;reader.readAsArrayBuffer(file)}function showFileName(input){var fileName=input.files.length>0?input.files[0].name:"未选择文件";document.getElementById("fileNameDisplay").innerText=fileName}document.addEventListener("DOMContentLoaded",function(){resetFileInput()});function resetFileInput(){console.log(document.getElementById("uploadForm"))} +)rawliteral"; + +void recWebServer() +{ + + // 首页 + server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) + { + const char* htmlContent = R"rawliteral( +FAKEAMSLIFE_WEB

FAKEAMSLIFE_WEB

设置

退料时间（秒）：

tips:时间设置为255为微动模式

固件更新

其他

格式化文件系统：

清除配置文件（包括打印机通道配置，退料时间），和擦除有类似效果，不过不用担心不会影响固件

版本号：%s

本项目在applenana/AP-AMS基础上继续开发,遵循MIT License

PA1NCL0WN

)rawliteral"; + + char htmlContentStr[2048]; + snprintf(htmlContentStr, sizeof(htmlContentStr), htmlContent,backStopTime, version); + + request->send(200, "text/html", htmlContentStr); }); + + // css + server.on("/styles.css", HTTP_GET, [](AsyncWebServerRequest *request) + { + const char* cssContent = R"rawliteral( +.hidden{display:none}.tooltip{position:relative;display:inline-block;cursor:pointer}.tooltip .tooltiptext{visibility:hidden;width:30%;background-color:#000;color:#fff;text-align:center;border-radius:5px;padding:5px 0;position:absolute;z-index:1;bottom:90%;left:50%;margin-left:-60px;opacity:0;transition:opacity .3s}.tooltip:hover .tooltiptext{visibility:visible;opacity:1}.input{max-width:190px;padding:12px;border:none;border-radius:4px;box-shadow:2px 2px 7px 0 rgba(0,0,0,.2);outline:0;color:#696969}.input:invalid{animation:justshake .3s forwards;color:red}@keyframes justshake{25%{transform:translateX(5px)}50%{transform:translateX(-5px)}75%{transform:translateX(5px)}to{transform:translateX(-5px)}}.btn{width:130px;height:40px;font-size:1.1em;cursor:pointer;background-color:#171717;color:#fff;border:none;border-radius:5px;transition:all .4s}.btn:hover{border-radius:5px;transform:translateY(-10px);box-shadow:0 7px 0 -2px #f85959,0 15px 0 -4px #39a2db,0 16px 10px -3px #39a2db}.btn:active{transition:all .2s;transform:translateY(-5px);box-shadow:0 2px 0 -2px #f85959,0 8px 0 -4px #39a2db,0 12px 10px -3px #39a2db}.card{width:80%;height:80%;margin:0 auto;border-radius:50px;background:#e0e0e0;box-shadow:20px 20px 60px #bebebe,-20px -20px 60px #fff;display:flex;flex-direction:column;justify-content:space-between;text-align:center;margin - top:10px;margin - bottom:10px}.css-button-arrow--sky{min-width:130px;height:40px;color:#fff;padding:5px 10px;font-weight:700;cursor:pointer;transition:all .3s ease;position:relative;display:inline-block;outline:0;overflow:hidden;border-radius:5px;border:none;background-color:#3a86ff}.css-button-arrow--sky:hover{border-radius:5px;padding-right:24px;padding-left:8px}.css-button-arrow--sky:hover:after{opacity:1;right:10px}.css-button-arrow--sky:after{content:"\00BB";position:absolute;opacity:0;font-size:20px;line-height:40px;top:0;right:-20px;transition:.4s}#uploadResult{margin-top:20px;font-size:1.2em;color:#333} + )rawliteral"; + request->send(200, "text/css", cssContent); }); + // js + server.on("/script.js", HTTP_GET, [](AsyncWebServerRequest *request) + { request->send_P(200, "text/javascript", jsContent); }); + // 设置停止延迟接口 + server.on("/setBackPullTimeArgs", HTTP_GET, [](AsyncWebServerRequest *request) + { + if (request->hasArg("number")) + { + String paramValueStr = request->arg("number"); + int tempValue = paramValueStr.toInt(); + if (tempValue >= 0 && tempValue <= 255) + { + backStopTime = uint8_t(tempValue); + setBackPullTime(backStopTime); + + } + request->send(200, "text/plain", "OK"); + return; + } + request->send(200, "text/plain", "FAIL"); }); + // 格式化FS功能 + server.on("/formatFS", HTTP_GET, [](AsyncWebServerRequest *request) + { + if (formatFS()) + { + request->send(200, "text/plain", "OK"); + return; + } + request->send(200, "text/plain", "FAIL"); }); +} \ No newline at end of file