Stay up-to-date wrt master (cc @mc-hamster)

# Conflicts: # src/plugins/Plugins.cpp # src/plugins/RangeTestPlugin.cpp # src/plugins/StoreForwardPlugin.cpp
2021-02-22 10:39:46 +08:00
parent d4781280b7 c6864417c6
commit 3088fe3f91
19 changed files with 845 additions and 278 deletions
@@ -20,6 +20,7 @@ typedef enum _PortNum {
    PortNum_ADMIN_APP = 6,
    PortNum_REPLY_APP = 32,
    PortNum_IP_TUNNEL_APP = 33,
+    PortNum_ENVIRONMENTAL_MEASUREMENT_APP = 34,
    PortNum_SERIAL_APP = 64,
    PortNum_STORE_FORWARD_APP = 65,
    PortNum_RANGE_TEST_APP = 66,