From 1c3784a22384fae67fc1ffc2f173767caa39c1c0 Mon Sep 17 00:00:00 2001 From: Magnus Date: Sat, 19 Nov 2022 10:00:36 +0100 Subject: [PATCH] Added serial pins for esp8266 --- platformio.ini | 107 +++++++++++++++++++++++++------------------------ src/helper.cpp | 5 +-- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/platformio.ini b/platformio.ini index 5083434..06801d4 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,13 +28,13 @@ build_flags = #-D DOUBLERESETDETECTOR_DEBUG=true -DACTIVATE_OTA -DCFG_DISABLE_LOGGING # Turn off verbose/notice logging to reduce size and dont overload uart (applies to LOG_LEVEL6) - -DGYRO_DISABLE_LOGGING - -DCALC_DISABLE_LOGGING - -DHELPER_DISABLE_LOGGING - -DPUSH_DISABLE_LOGGING - -DTSEN_DISABLE_LOGGING - -DWIFI_DISABLE_LOGGING - -DWEB_DISABLE_LOGGING + -DGYRO_DISABLE_LOGGING + -DCALC_DISABLE_LOGGING + -DHELPER_DISABLE_LOGGING + -DPUSH_DISABLE_LOGGING + -DTSEN_DISABLE_LOGGING + -DWIFI_DISABLE_LOGGING + -DWEB_DISABLE_LOGGING -DMAIN_DISABLE_LOGGING -DUSE_LITTLEFS=true -DUSER_SSID=\""\"" # =\""myssid\"" @@ -94,8 +94,9 @@ platform = ${common_env_data.platform} extra_scripts = ${common_env_data.extra_scripts} build_unflags = ${common_env_data.build_unflags} build_flags = - ${common_env_data.build_flags} + ${common_env_data.build_flags} -D LOG_LEVEL=4 + #-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port lib_deps = https://github.com/mp-se/incbin # https://github.com/graphitemaster/incbin ${common_env_data.lib_deps} @@ -125,13 +126,13 @@ build_type = release board_build.partitions = part32.csv board_build.filesystem = littlefs board_build.embed_txtfiles = - html/calibration.min.htm - html/config.min.htm - html/firmware.min.htm - html/format.min.htm - html/about.min.htm - html/index.min.htm - html/test.min.htm + html/calibration.min.htm + html/config.min.htm + html/firmware.min.htm + html/format.min.htm + html/about.min.htm + html/index.min.htm + html/test.min.htm [env:gravity32c3-release] framework = ${common_env_data.framework} @@ -146,7 +147,7 @@ build_flags = ${common_env_data.build_flags} -DLOG_LEVEL=5 -DCORE_DEBUG_LEVEL=0 - -DESP32C3 + -DESP32C3 -DARDUINO_ESP32C3_DEV -DREDUCE_WIFI_POWER # Enable this if v1.0 chip is used #-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port @@ -159,13 +160,13 @@ build_type = release board_build.partitions = part32.csv board_build.filesystem = littlefs board_build.embed_txtfiles = - html/calibration.min.htm - html/config.min.htm - html/firmware.min.htm - html/format.min.htm - html/about.min.htm - html/index.min.htm - html/test.min.htm + html/calibration.min.htm + html/config.min.htm + html/firmware.min.htm + html/format.min.htm + html/about.min.htm + html/index.min.htm + html/test.min.htm [env:gravity32s2-release] framework = ${common_env_data.framework} @@ -180,7 +181,7 @@ build_flags = ${common_env_data.build_flags} -DLOG_LEVEL=5 -DCORE_DEBUG_LEVEL=0 - -DESP32S2 + -DESP32S2 -DARDUINO_ESP32S2_DEV #-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port lib_deps = @@ -191,13 +192,13 @@ build_type = release board_build.partitions = part32.csv board_build.filesystem = littlefs board_build.embed_txtfiles = - html/calibration.min.htm - html/config.min.htm - html/firmware.min.htm - html/format.min.htm - html/about.min.htm - html/index.min.htm - html/test.min.htm + html/calibration.min.htm + html/config.min.htm + html/firmware.min.htm + html/format.min.htm + html/about.min.htm + html/index.min.htm + html/test.min.htm [env:gravity32c3-debug] framework = ${common_env_data.framework} @@ -211,13 +212,13 @@ debug_tool = esp-prog debug_init_break = break setup build_unflags = -DCFG_DISABLE_LOGGING - -DGYRO_DISABLE_LOGGING - -DCALC_DISABLE_LOGGING - -DHELPER_DISABLE_LOGGING - -DPUSH_DISABLE_LOGGING - -DTSEN_DISABLE_LOGGING - -DWIFI_DISABLE_LOGGING - -DWEB_DISABLE_LOGGING + -DGYRO_DISABLE_LOGGING + -DCALC_DISABLE_LOGGING + -DHELPER_DISABLE_LOGGING + -DPUSH_DISABLE_LOGGING + -DTSEN_DISABLE_LOGGING + -DWIFI_DISABLE_LOGGING + -DWEB_DISABLE_LOGGING -DMAIN_DISABLE_LOGGING ${common_env_data.build_unflags} build_flags = @@ -226,7 +227,7 @@ build_flags = -DLOG_LEVEL=6 -DCORE_DEBUG_LEVEL=5 -DJTAG_DEBUG - -DESP32C3 + -DESP32C3 #-DUSE_SERIAL_PINS # Use the TX/RX pins for the serial port -DARDUINO_ESP32C3_DEV -DCOLLECT_PERFDATA # Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb @@ -239,13 +240,13 @@ build_type = debug board_build.partitions = part32.csv board_build.filesystem = littlefs board_build.embed_txtfiles = - html/calibration.min.htm - html/config.min.htm - html/firmware.min.htm - html/format.min.htm - html/about.min.htm - html/index.min.htm - html/test.min.htm + html/calibration.min.htm + html/config.min.htm + html/firmware.min.htm + html/format.min.htm + html/about.min.htm + html/index.min.htm + html/test.min.htm # This is a version for the floaty hardware. No DSB18 sensor and no battery measurement. [env:gravity32lite-release] @@ -273,10 +274,10 @@ build_type = release board_build.partitions = part32.csv board_build.filesystem = littlefs board_build.embed_txtfiles = - html/calibration.min.htm - html/config.min.htm - html/firmware.min.htm - html/format.min.htm - html/about.min.htm - html/index.min.htm - html/test.min.htm + html/calibration.min.htm + html/config.min.htm + html/firmware.min.htm + html/format.min.htm + html/about.min.htm + html/index.min.htm + html/test.min.htm diff --git a/src/helper.cpp b/src/helper.cpp index 47057ad..9f47fbb 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -238,9 +238,8 @@ void printBuildOptions() { SerialDebug::SerialDebug(const uint32_t serialSpeed) { // Start serial with auto-detected rate (default to defined BAUD) #if defined(USE_SERIAL_PINS) && defined(ESP8266) - // EspSerial.begin(serialSpeed, SERIAL_8N1, 3, 1); - EspSerial.begin(serialSpeed); -#warning "SerialPins is not implemented on ESP8266" + uint8_t txPin = 3; + EspSerial.begin(serialSpeed, SERIAL_8N1, SERIAL_TX_ONLY, txPin); #elif defined(ESP8266) EspSerial.begin(serialSpeed); #elif defined(USE_SERIAL_PINS) && defined(ESP32C3)