support msp version 2

Cargo.toml

@@ -1,19 +1,21 @@
 [package]
-name = "multiwii_serial_protocol"
+name = "multiwii_serial_protocol_v2"
 description = "A Multiwii Serial Protocol (MSP) implementation for Rust"
-repository = "https://github.com/hashmismatch/multiwii_serial_protocol.rs"
-version = "0.1.1"
-authors = ["Rudi Benkovic <[email protected]>"]
+repository = "https://github.com/amfern/multiwii_serial_protocol.rs"
+version = "0.1.11"
+authors = ["Rudi Benkovic <[email protected]>", "Ilya Guterman <[email protected]>"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 
 [dependencies]
-packed_struct = "0.2"
-packed_struct_codegen = "0.2"
+packed_struct = "0.3"
+packed_struct_codegen = "0.3"
 serde = "1.0"
 serde_derive = "1.0"
+crc-any = "2.3"
 
 [features]
 default = ["std"]
 std = []
-no_std = []
+no_std = []
+suppport_int32_setting_type = []

README.md

@@ -7,21 +7,23 @@ A Multiwii Serial Protocol (MSP) implementation for Rust
 
 ## Introduction
 
-An incomplete implementation of the MSP protocol, with some Cleanflight and Betaflight extensions. Allows one to implement a flight controller that can connect to the Cleanflight or Baseflight configurator.
+This is a fork of https://github.com/hashmismatch/multiwii_serial_protocol.rs!
+
+An incomplete implementation of the MSP2 protocol, with some Cleanflight, Betaflight and iNav extensions. Allows one to implement a flight controller that can connect to the Cleanflight or Baseflight configurator.
 
 # Installation
 
 MSP is available on crates.io and can be included in your Cargo enabled project like this:
 
 ```toml
 [dependencies]
-multiwii_serial_protocol = "0.1.0"
+multiwii_serial_protocol_2 = "0.1.9"
 ```
 
 Then include it in your code like this:
 
 ```rust
-extern crate multiwii_serial_protocol;
+extern crate multiwii_serial_protocol_2;
 ```
 
 License: MIT OR Apache-2.0

src/commands.rs

@@ -1,4 +1,4 @@
-#[derive(PrimitiveEnum_u8)]
+#[derive(PrimitiveEnum)]
 #[derive(Debug, Copy, Clone, PartialEq)]
 #[allow(non_camel_case_types)]
 
@@ -57,6 +57,12 @@ pub enum MspCommandCode {
     MSP_TRANSPONDER_CONFIG =      82,
     MSP_SET_TRANSPONDER_CONFIG =  83,
 
+    MSP_OSD_CONFIG =              84, //out message         Get osd settings - baseflight
+    MSP_SET_OSD_CONFIG =          85, //in message          Set osd settings - baseflight
+
+    MSP_OSD_CHAR_READ =           86, //out message         Get osd settings - betaflight
+    MSP_OSD_CHAR_WRITE =          87, //in message          Set osd settings - betaflight
+
     MSP_LED_STRIP_MODECOLOR =     127,
     MSP_SET_LED_STRIP_MODECOLOR = 221,
 
@@ -157,5 +163,28 @@ pub enum MspCommandCode {
     MSP_SET_PID_ADVANCED =           95,
 
     MSP_SENSOR_CONFIG =              96,
-    MSP_SET_SENSOR_CONFIG =          97
+    MSP_SET_SENSOR_CONFIG =          97,
+
+    // Inav
+    MSP2_COMMON_SETTING =            0x1003,  //in/out message    Returns the value for a setting
+    MSP2_COMMON_SET_SETTING =        0x1004,  //in message        Sets the value for a setting
+
+    MSP2_MOTOR_MIXER =               0x1005,
+    MSP2_SET_MOTOR_MIXER =           0x1006,
+
+    MSP2_COMMON_SETTING_INFO =       0x1007,
+    MSP2_COMMON_PG_LIST =            0x1008,
+
+    MSP2_SERIAL_CONFIG =             0x1009,
+    MSP2_SET_SERIAL_CONFIG =         0x100A,
+
+    MSP2_INAV_OSD_LAYOUTS =          0x2012,
+    MSP2_INAV_OSD_SET_LAYOUT_ITEM =  0x2013,
+    MSP2_INAV_OSD_ALARMS =           0x2014,
+    MSP2_INAV_OSD_SET_ALARMS =       0x2015,
+    MSP2_INAV_OSD_PREFERENCES =      0x2016,
+    MSP2_INAV_OSD_SET_PREFERENCES =  0x2017,
+
+    MSP2_INAV_SERVO_MIXER =          0x2020,
+    MSP2_INAV_SET_SERVO_MIXER =      0x2021,
 }

src/lib.rs

@@ -12,6 +12,8 @@ extern crate alloc;
 
 extern crate packed_struct;
 
+extern crate crc_any;
+
 #[macro_use]
 extern crate packed_struct_codegen;