diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp index 7c8037c900..ac96c7db61 100644 --- a/ArduSub/Parameters.cpp +++ b/ArduSub/Parameters.cpp @@ -43,14 +43,6 @@ const AP_Param::Info Sub::var_info[] = { // @ReadOnly: True GSCALAR(format_version, "SYSID_SW_MREV", 0), - // @Param: SYSID_SW_TYPE - // @DisplayName: Software Type - // @Description: This is used by the ground station to recognise the software type (eg ArduPlane vs ArduCopter) - // @Values: 0:ArduPlane,4:AntennaTracker,10:Copter,20:Rover,40:ArduSub - // @User: Advanced - // @ReadOnly: True - GSCALAR(software_type, "SYSID_SW_TYPE", Parameters::k_software_type), - // @Param: SYSID_THISMAV // @DisplayName: MAVLink system ID of this vehicle // @Description: Allows setting an individual MAVLink system id for this vehicle to distinguish it from others on the same network diff --git a/ArduSub/Parameters.h b/ArduSub/Parameters.h index 26fb40e407..f878d4d267 100644 --- a/ArduSub/Parameters.h +++ b/ArduSub/Parameters.h @@ -18,15 +18,6 @@ public: // static const uint16_t k_format_version = 1; - // The parameter software_type is set up solely for ground station use - // and identifies the software type (eg ArduPilotMega versus - // ArduCopterMega) - // GCS will interpret values 0-9 as ArduPilotMega. Developers may use - // values within that range to identify different branches. - // - static const uint16_t k_software_type = 40; // 0 for APM - // trunk - // Parameter identities. // // The enumeration defined here is used to ensure that every parameter @@ -50,7 +41,7 @@ public: // Layout version number, always key zero. // k_param_format_version = 0, - k_param_software_type, + k_param_software_type, // unusued k_param_g2, // 2nd block of parameters @@ -218,7 +209,6 @@ public: }; AP_Int16 format_version; - AP_Int8 software_type; // Telemetry control //