Merge branch 'release_candidate' into Fix_#144_#150

Author: PaulZC

Firmware/RTK_Everywhere/TcpServer.ino

@@ -31,7 +31,7 @@ tcpServer.ino
 
 */
 
-#ifdef COMPILE_WIFI
+#ifdef COMPILE_NETWORK
 
 //----------------------------------------
 // Constants
@@ -65,7 +65,7 @@ const RtkMode_t tcpServerMode = RTK_MODE_BASE_FIXED | RTK_MODE_BASE_SURVEY_IN |
 //----------------------------------------
 
 // TCP server
-static WiFiServer *tcpServer = nullptr;
+static NetworkServer *tcpServer = nullptr;
 static uint8_t tcpServerState;
 static uint32_t tcpServerTimer;
 
@@ -234,13 +234,13 @@ bool tcpServerStart()
         systemPrintln("TCP server starting the server");
 
     // Start the TCP server
-    tcpServer = new WiFiServer(settings.tcpServerPort);
+    tcpServer = new NetworkServer(settings.tcpServerPort, TCP_SERVER_MAX_CLIENTS);
     if (!tcpServer)
         return false;
 
     tcpServer->begin();
     online.tcpServer = true;
-    localIp = wifiGetIpAddress();
+    localIp = networkGetIpAddress(networkGetType());
     systemPrintf("TCP server online, IP address %d.%d.%d.%d:%d\r\n", localIp[0], localIp[1], localIp[2], localIp[3],
                  settings.tcpServerPort);
     return true;
@@ -460,7 +460,7 @@ void tcpServerUpdate()
                     break;
 
                 // Start processing the new TCP server client connection
-                tcpServerClient[index] = new RTKNetworkClientType(client, NETWORK_TYPE_WIFI);
+                tcpServerClient[index] = new RTKNetworkClientType(client, networkGetType());
                 tcpServerClientIpAddress[index] = tcpServerClient[index]->remoteIP();
                 tcpServerClientConnected = tcpServerClientConnected | (1 << index);
                 tcpServerClientDataSent = tcpServerClientDataSent | (1 << index);
@@ -515,4 +515,4 @@ void tcpServerZeroTail()
         tcpServerClientTails[index] = 0;
 }
 
-#endif // COMPILE_WIFI
+#endif // COMPILE_NETWORK

Firmware/RTK_Everywhere/makefile

@@ -14,21 +14,51 @@ EXECUTABLES += RTK
 
 PARTITION_CSV_FILE=RTKEverywhere
 
-# Windows NT
 ifeq ($(OS),Windows_NT)
-BLE_PATCH_DST_PATH=C:\Users\$(USERNAME)\Documents\Arduino\libraries\ESP32_BleSerial\src\BleSerial.cpp
-BLE_PATCH_SRC_PATH=Patch\BleSerial.cpp
+# Windows NT utilities
+CLEAR=cls
 COPY=copy
-PARTITION_DST_PATH=C:\Users\$(USERNAME)\AppData\Local\Arduino15\packages\esp32\hardware\esp32\$(ESP_CORE_VERSION)\tools\partitions\$(PARTITION_CSV_FILE).csv
+DIR_LISTING=dir
+TERMINAL_APP=
+TERMINAL_PARAMS=
+
+# Windows NT generic paths
+USER_DIRECTORY_PATH=C:\Users\$(USERNAME)
+ARDUINO_LIBRARY_PATH=$(USER_DIRECTORY_PATH)\Documents\Arduino\libraries
+HOME_BOARD_PATH=$(USER_DIRECTORY_PATH)\AppData\Local\Arduino15\packages\esp32
+PATCH_SRC_PATH=Patch\
+
+# Windows NT patch source paths
 PARTITION_SRC_PATH=..\$(PARTITION_CSV_FILE).csv
+PATCH_SRC_PATH=Patch\
+
+# Windows NT patch destination paths
+BLE_PATCH_DST_PATH=$(ARDUINO_LIBRARY_PATH)\ESP32_BleSerial\src\
+MBED_LIB_DEST_PATH=$(HOME_BOARD_PATH)\tools\esp32-arduino-libs\${{ env.ESP_IDF }}\esp32/lib\
+PARTITION_DST_PATH=$(HOME_BOARD_PATH)\hardware\esp32\$(ESP_CORE_VERSION)\tools\partitions\$(PARTITION_CSV_FILE).csv
 
-# Linux
 else
-BLE_PATCH_DST_PATH=~/Arduino/libraries/ESP32_BleSerial/src/BleSerial.cpp
-BLE_PATCH_SRC_PATH=Patch/BleSerial.cpp
+# Linux utilities
+CLEAR=clear
 COPY=cp
-PARTITION_DST_PATH=~/.arduino15/packages/esp32/hardware/esp32/$(ESP_CORE_VERSION)/tools/partitions/$(PARTITION_CSV_FILE).csv
+DIR_LISTING=ls
+TERMINAL_APP=minicom
+TERMINAL_PARAMS=-b 115200 -8 -D /dev/ttyUSB0 < /dev/tty
+
+# Linux generic paths
+USER_DIRECTORY_PATH=~
+ARDUINO_LIBRARY_PATH=$(USER_DIRECTORY_PATH)/Arduino/libraries
+ESP_IDF_PATH=$(HOME_BOARD_PATH)/tools/esp32-arduino-libs
+HOME_BOARD_PATH=$(USER_DIRECTORY_PATH)/.arduino15/packages/esp32
+
+# Linux patch source paths
 PARTITION_SRC_PATH=../$(PARTITION_CSV_FILE).csv
+PATCH_SRC_PATH=Patch/
+
+# Linux patch destination paths
+BLE_PATCH_DST_PATH=$(ARDUINO_LIBRARY_PATH)/ESP32_BleSerial/src/
+MBED_LIB_DEST_PATH=$(ESP_IDF_PATH)/$(ESP_IDF_VERSION)/esp32/lib/
+PARTITION_DST_PATH=$(HOME_BOARD_PATH)/hardware/esp32/$(ESP_CORE_VERSION)/tools/partitions/$(PARTITION_CSV_FILE).csv
 
 endif
 
@@ -56,6 +86,7 @@ arduino-config:
 .PHONY: lib-update
 
 ESP_CORE_VERSION=3.0.1
+ESP_IDF_VERSION=idf-release_v5.1-442a798083
 
 lib-update:
 	arduino-cli core update-index
@@ -84,9 +115,24 @@ lib-update:
 $(PARTITION_DST_PATH):	$(PARTITION_SRC_PATH)
 	$(COPY)  $(PARTITION_SRC_PATH)  $(PARTITION_DST_PATH)
 
-$(BLE_PATCH_DST_PATH): 	$(BLE_PATCH_SRC_PATH)
-	$(COPY)  $(BLE_PATCH_SRC_PATH)  $(BLE_PATCH_DST_PATH)
+$(BLE_PATCH_DST_PATH)BleSerial.cpp: 	$(PATCH_SRC_PATH)BleSerial.cpp
+	$(COPY)  $<  $@
+
+$(MBED_LIB_DEST_PATH)libmbedtls.a: 	$(PATCH_SRC_PATH)libmbedtls.a  $(ESP_IDF_PATH)
+	$(DIR_LISTING) $(ESP_IDF_PATH)
+	echo ESP_
+	$(COPY)  $<  $@
+
+$(MBED_LIB_DEST_PATH)libmbedtls_2.a: 	$(PATCH_SRC_PATH)libmbedtls_2.a
+	$(COPY)  $<  $@
+
+$(MBED_LIB_DEST_PATH)libmbedcrypto.a: 	$(PATCH_SRC_PATH)libmbedcrypto.a
+	$(COPY)  $<  $@
+
+$(MBED_LIB_DEST_PATH)libmbedx509.a: 	$(PATCH_SRC_PATH)libmbedx509.a
+	$(COPY)  $<  $@
 
+#DEBUG_LEVEL=none
 DEBUG_LEVEL=debug
 ENABLE_DEVELOPER=false
 FIRMWARE_VERSION_MAJOR=99
@@ -97,7 +143,8 @@ form.h:	AP-Config/* AP-Config/src/* AP-Config/src/fonts/*
 	python ../Tools/index_html_zipper.py AP-Config/index.html form.h
 	python ../Tools/main_js_zipper.py AP-Config/src/main.js form.h
 
-RTK:	RTK_Everywhere.ino *.ino *.h $(PARTITION_DST_PATH) $(BLE_PATCH_DST_PATH)
+RTK:	RTK_Everywhere.ino *.ino *.h $(PARTITION_DST_PATH) $(BLE_PATCH_DST_PATH) $(MBED_LIB_DEST_PATH)libmbedtls.a $(MBED_LIB_DEST_PATH)libmbedtls_2.a $(MBED_LIB_DEST_PATH)libmbedcrypto.a $(MBED_LIB_DEST_PATH)libmbedx509.a
+	$(CLEAR)
 	arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=$(DEBUG_LEVEL),PSRAM=enabled RTK_Everywhere.ino \
 		--warnings default \
 		--build-property build.partitions=$(PARTITION_CSV_FILE) \
@@ -132,7 +179,7 @@ upload:	build/esp32.esp32.esp32/$(SKETCH).bin
          0x8000   $(BOOT_LOADER_PATH)/RTK_Surveyor_Partitions_16MB.bin \
          0xe000   $(BOOT_LOADER_PATH)/boot_app0.bin \
         0x10000   $<
-	~/SparkFun/serial-115200.sh   ttyUSB0
+	$(TERMINAL_APP) $(TERMINAL_PARAMS)
 
 ########
 # Clean the build directory