diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index e3c1fb208d..f82191ce63 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -36,14 +36,6 @@ const AP_Param::Info Copter::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/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 0047a6dfd3..d266c68505 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -16,15 +16,6 @@ public: // static const uint16_t k_format_version = 120; - // 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 = 10; // 0 for APM - // trunk - // Parameter identities. // // The enumeration defined here is used to ensure that every parameter @@ -48,7 +39,7 @@ public: // Layout version number, always key zero. // k_param_format_version = 0, - k_param_software_type, + k_param_software_type, // deprecated k_param_ins_old, // *** Deprecated, remove with next eeprom number change k_param_ins, // libraries/AP_InertialSensor variables k_param_NavEKF2_old, // deprecated - remove @@ -375,7 +366,6 @@ public: }; AP_Int16 format_version; - AP_Int8 software_type; // Telemetry control //