update bp_version, remove serial control

olliw42 · Sep 3, 2024 · 4a6c667 · 4a6c667
1 parent 86ee621
commit 4a6c667
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/libraries/GCS_MAVLink/GCS_serial_control.cpp b/libraries/GCS_MAVLink/GCS_serial_control.cpp
@@ -114,22 +114,6 @@ void GCS_MAVLINK::handle_serial_control(const mavlink_message_t &msg)
         port->begin(packet.baudrate);
     }
 
-//OW SERIALCONTROL
-    #define SERIAL_CONTROL_FLAG_8N1  0x40
-    #define SERIAL_CONTROL_FLAG_8E1  0x80
-
-    if (exclusive && port != nullptr) {
-        if (packet.flags & SERIAL_CONTROL_FLAG_8N1) {
-            port->configure_parity(0);
-            port->set_stop_bits(1);
-        }
-        if (packet.flags & SERIAL_CONTROL_FLAG_8E1) {
-            port->configure_parity(2); // enable even parity
-            port->set_stop_bits(1);
-        }
-    }
-//OWEND
-
     // write the data
     if (packet.count != 0) {
         if ((packet.flags & SERIAL_CONTROL_FLAG_BLOCKING) == 0) {

diff --git a/libraries/bp_version.h b/libraries/bp_version.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#define BETAPILOTVERSION "v060h"
-#define DATEOFBASEBRANCH "20240525"
+#define BETAPILOTVERSION "v060i"
+#define DATEOFBASEBRANCH "20240903"
 
 /*
 search for //OW to find all changes  THR_MINSPD THR_SLEW SUPP_MAN waiting for rudder release
 
 on-top features:
 - RADIO_LINK (OW RADIOLINK)
-- GCS_serial_control: SERIAL_CONTROL 8E1 (OW SERIALCONTROL)
 - RC_Channel, AUX_FUNC: CAMERA_SET_MODE, CAMERA_TRIG_MODE (eq CAM_MODE_TOGGLE) (OW CAMERA)
 - Plane THR (OW THR_SUPP)
 
  remove zflags, not used, could use now options
-2024.05.25: v060
+ remove GCS_serial_control: SERIAL_CONTROL 8E1
+2024.09.03: v060
  upgraded to ArduPilot master 4.6.0-dev
 2023.11.06: v059
  upgraded to ArduPilot master 4.5.0-dev, mount revised significantly