Revert "Reset PIDs button to use applied defaults"

5 files changed, 165 insertions, 378 deletions

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 88f69056..2789c245 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -49,9 +49,6 @@
     "savingDefaults": {
         "message": "Device - <span style=\"color: red\">Saving default settings</span>"
     },
-    "resettingPIDs": {
-        "message": "Device - <span style=\"color: red\">Resetting PID & related settings</span>"
-    },
     "fcNotConnected": {
         "message": "Not connected"
     },
@@ -3886,7 +3883,7 @@
         "message": "This will allow to select new default values for all settings. Existing PID tune and other settings might be lost!\nDo you want to continue?"
     },
     "confirm_reset_pid": {
-        "message": "This will reset all PID settings for the current profile to platform default values and save.\nDo you want to continue?"
+        "message": "This will reset all PID settings to firmware default values and save.\nDo you want to continue?"
     },
     "mappingTableOutput": {
         "message": "Output"
diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js
index 6e686616..19bca033 100644
--- a/js/defaults_dialog.js
+++ b/js/defaults_dialog.js
@@ -20,226 +20,185 @@ helper.defaultsDialog = (function () {
         "settings": [
             {
                 key: "model_preview_type",
-                value: 3, 
-                allow_reset: true
+                value: 3
             },
             /*
             System
             */
             {
                 key: "gyro_hardware_lpf",
-                value: "256HZ", 
-                allow_reset: true
+                value: "256HZ"
             },
             {
                 key: "looptime",
-                value: 500, 
-                allow_reset: true
+                value: 500
             },
             {
                 key: "motor_pwm_protocol",
-                value: "DSHOT300", 
-                allow_reset: false
+                value: "DSHOT300"
             },
             /*
             Filtering
             */
             {
                 key: "gyro_main_lpf_hz",
-                value: 110, 
-                allow_reset: true
+                value: 110
             },
             {
                 key: "gyro_main_lpf_type",
-                value: "PT1", 
-                allow_reset: true
+                value: "PT1"
             },
             {
                 key: "dterm_lpf_hz",
-                value: 110, 
-                allow_reset: true
+                value: 110
             },
             {
                 key: "dterm_lpf_type",
-                value: "PT3", 
-                allow_reset: true
+                value: "PT3"
             },
             {
                 key: "dterm_lpf2_hz",
-                value: 0, 
-                allow_reset: true
+                value: 0
             },
             {
                 key: "dterm_lpf2_type",
-                value: "PT1", 
-                allow_reset: true
+                value: "PT1"
             },
             {
                 key: "dynamic_gyro_notch_enabled",
-                value: "ON", 
-                allow_reset: true
+                value: "ON"
             },
             {
                 key: "dynamic_gyro_notch_q",
-                value: 250, 
-                allow_reset: true
+                value: 250
             },
             {
                 key: "dynamic_gyro_notch_min_hz",
-                value: 120, 
-                allow_reset: true
+                value: 120
             },
             {
                 key: "setpoint_kalman_enabled",
-                value: "ON", 
-                allow_reset: true
+                value: "ON"
             },
             {
                 key: "setpoint_kalman_q",
-                value: 200, 
-                allow_reset: true
+                value: 200
             },
             {
                 key: "smith_predictor_delay",   // Enable Smith Predictor 
-                value: 1.5, 
-                allow_reset: true
+                value: 1.5
             },   
             /*
             Mechanics
             */
             {
                 key: "airmode_type",
-                value: "THROTTLE_THRESHOLD", 
-                allow_reset: true
+                value: "THROTTLE_THRESHOLD"
             },
             {
                 key: "airmode_throttle_threshold",
-                value: 1150, 
-                allow_reset: true
+                value: 1150
             },
             {
                 key: "mc_iterm_relax",
-                value: "RP", 
-                allow_reset: true
+                value: "RP"
             },
             {
                 key: "d_boost_min",
-                value: 0.8, 
-                allow_reset: true
+                value: 0.8
             },
             {
                 key: "d_boost_max",
-                value: 1.2, 
-                allow_reset: true
+                value: 1.2
             },
             {
                 key: "antigravity_gain",
-                value: 2, 
-                allow_reset: true
+                value: 2
             },
             {
                 key: "antigravity_accelerator",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             /*
             Rates
             */
             {
                 key: "rc_yaw_expo",
-                value: 75, 
-                allow_reset: true
+                value: 75
             },
             {
                 key: "rc_expo",
-                value: 75, 
-                allow_reset: true
+                value: 75
             },
             {
                 key: "roll_rate",
-                value: 70, 
-                allow_reset: true
+                value: 70
             },
             {
                 key: "pitch_rate",
-                value: 70, 
-                allow_reset: true
+                value: 70
             },
             {
                 key: "yaw_rate",
-                value: 60, 
-                allow_reset: true
+                value: 60
             },
             /*
             PIDs
             */
             {
                 key: "mc_p_pitch",
-                value: 44, 
-                allow_reset: true
+                value: 44
             },
             {
                 key: "mc_i_pitch",
-                value: 75, 
-                allow_reset: true
+                value: 75
             },
             {
                 key: "mc_d_pitch",
-                value: 25, 
-                allow_reset: true
+                value: 25
             },
             {
                 key: "mc_p_roll",
-                value: 40, 
-                allow_reset: true
+                value: 40
             },
             {
                 key: "mc_i_roll",
-                value: 60, 
-                allow_reset: true
+                value: 60
             },
             {
                 key: "mc_d_roll",
-                value: 23, 
-                allow_reset: true
+                value: 23
             },
             {
                 key: "mc_p_yaw",
-                value: 35, 
-                allow_reset: true
+                value: 35
             },
             {
                 key: "mc_i_yaw",
-                value: 80, 
-                allow_reset: true
+                value: 80
             },
             /*
              * TPA
              */
             {
                 key: "tpa_rate",
-                value: 20, 
-                allow_reset: true
+                value: 20
             },
             {
                 key: "tpa_breakpoint",
-                value: 1200, 
-                allow_reset: true
+                value: 1200
             },
             {
                 key: "platform_type",
-                value: "MULTIROTOR", 
-                allow_reset: false
+                value: "MULTIROTOR"
             },
             {
                 key: "applied_defaults",
-                value: 2, 
-                allow_reset: false
+                value: 2
             },
             {
                 key: "failsafe_procedure",
-                value: "DROP", 
-                allow_reset: false
+                value: "DROP"
             }
         ]
     },
@@ -252,233 +211,187 @@ helper.defaultsDialog = (function () {
         "settings": [
             {
                 key: "model_preview_type",
-                value: 14, 
-                allow_reset: false
+                value: 14
             },
             {
                 key: "platform_type",
-                value: "AIRPLANE", 
-                allow_reset: false
+                value: "AIRPLANE"
             },
             {
                 key: "applied_defaults",
-                value: 3, 
-                allow_reset: false
+                value: 3
             },
             {
                 key: "gyro_hardware_lpf",
-                value: "256HZ", 
-                allow_reset: true
+                value: "256HZ"
             },
             {
                 key: "gyro_main_lpf_hz",
-                value: 25, 
-                allow_reset: true
+                value: 25
             },
             {
                 key: "dterm_lpf_hz",
-                value: 10, 
-                allow_reset: true
+                value: 10
             },
             {
                 key: "d_boost_min",
-                value: 1, 
-                allow_reset: true
+                value: 1
             },
             {
                 key: "d_boost_max",
-                value: 1, 
-                allow_reset: true
+                value: 1
             },
             {
                 key: "gyro_main_lpf_type",
-                value: "BIQUAD", 
-                allow_reset: true
+                value: "BIQUAD"
             },
             {
                 key: "dynamic_gyro_notch_enabled",
-                value: "ON", 
-                allow_reset: true
+                value: "ON"
             },
             {
                 key: "dynamic_gyro_notch_q",
-                value: 250, 
-                allow_reset: true
+                value: 250
             },
             {
                 key: "dynamic_gyro_notch_min_hz",
-                value: 30, 
-                allow_reset: true
+                value: 30
             },
             {
                 key: "motor_pwm_protocol",
-                value: "STANDARD", 
-                allow_reset: false
+                value: "STANDARD"
             },
             {
                 key: "throttle_idle",
-                value: 5.0, 
-                allow_reset: false
+                value: 5.0
             },
             {
                 key: "rc_yaw_expo",
-                value: 30, 
-                allow_reset: false
+                value: 30
             },
             {
                 key: "rc_expo",
-                value: 30, 
-                allow_reset: false
+                value: 30
             },
             {
                 key: "roll_rate",
-                value: 18, 
-                allow_reset: true
+                value: 18
             },
             {
                 key: "pitch_rate",
-                value: 9, 
-                allow_reset: true
+                value: 9
             },
             {
                 key: "yaw_rate",
-                value: 3, 
-                allow_reset: true
+                value: 3
             },
             {
                 key: "nav_fw_pos_z_p",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "nav_fw_pos_z_d",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "nav_fw_pos_xy_p",
-                value: 60, 
-                allow_reset: true
+                value: 60
             },
             {
                 key: "fw_turn_assist_pitch_gain",
-                value: 0.5, 
-                allow_reset: true
+                value: 0.5
             },
             {
                 key: "max_angle_inclination_rll",
-                value: 450, 
-                allow_reset: true
+                value: 450
             },
             {
                 key: "nav_fw_bank_angle",
-                value: 35, 
-                allow_reset: true
+                value: 35
             },
             {
                 key: "fw_p_pitch",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "fw_i_pitch",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "fw_d_pitch",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "fw_ff_pitch",
-                value: 80, 
-                allow_reset: true
+                value: 80
             },
             {
                 key: "fw_p_roll",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "fw_i_roll",
-                value: 3, 
-                allow_reset: true
+                value: 3
             },
             {
                 key: "fw_d_roll",
-                value: 7, 
-                allow_reset: true
+                value: 7
             },
             {
                 key: "fw_ff_roll",
-                value: 50, 
-                allow_reset: true
+                value: 50
             },
             {
                 key: "fw_p_yaw",
-                value: 20, 
-                allow_reset: true
+                value: 20
             },
             {
                 key: "fw_i_yaw",
-                value: 0, 
-                allow_reset: true
+                value: 0
             },
             {
                 key: "fw_d_yaw",
-                value: 0, 
-                allow_reset: true
+                value: 0
             },
             {
                 key: "fw_ff_yaw",
-                value: 100, 
-                allow_reset: true
+                value: 100
             },
             {
                 key: "imu_acc_ignore_rate",
-                value: 9, 
-                allow_reset: true
+                value: 9
             },
             {
                 key: "imu_acc_ignore_slope",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "airmode_type",
-                value: "STICK_CENTER_ONCE", 
-                allow_reset: true
+                value: "STICK_CENTER_ONCE"
             },
             {
                 key: "small_angle",
-                value: 180, 
-                allow_reset: true
+                value: 180
             },
             {
                 key: "nav_fw_control_smoothness",
-                value: 2, 
-                allow_reset: true
+                value: 2
             },
             {
                 key: "nav_rth_allow_landing",
-                value: "FS_ONLY", 
-                allow_reset: false
+                value: "FS_ONLY"
             },
             {
                 key: "nav_rth_altitude",
-                value: 5000, 
-                allow_reset: false
+                value: 5000
             },
             {
                 key: "failsafe_mission",
-                value: "ON", 
-                allow_reset: false
+                value: "ON"
             },
             {
                 key: "nav_wp_radius",
-                value: 5000, 
-                allow_reset: false
+                value: 5000
             },
         ],
         "features": [
@@ -491,239 +404,193 @@ helper.defaultsDialog = (function () {
     {
         "title": 'Airplane without a Tail (Wing, Delta, etc)',
         "notRecommended": false,
-        "id": 4,
+        "id": 3,
         "reboot": true,
         "mixerToApply": 8,
         "settings": [
             {
                 key: "model_preview_type",
-                value: 8, 
-                allow_reset: false
+                value: 8
             },
             {
                 key: "platform_type",
-                value: "AIRPLANE", 
-                allow_reset: false
+                value: "AIRPLANE"
             },
             {
                 key: "applied_defaults",
-                value: 4, 
-                allow_reset: false
+                value: 3
             },
             {
                 key: "gyro_hardware_lpf",
-                value: "256HZ", 
-                allow_reset: true
+                value: "256HZ"
             },
             {
                 key: "gyro_main_lpf_hz",
-                value: 25, 
-                allow_reset: true
+                value: 25
             },
             {
                 key: "dterm_lpf_hz",
-                value: 10, 
-                allow_reset: true
+                value: 10
             },
             {
                 key: "d_boost_min",
-                value: 1, 
-                allow_reset: true
+                value: 1
             },
             {
                 key: "d_boost_max",
-                value: 1, 
-                allow_reset: true
+                value: 1
             },
             {
                 key: "gyro_main_lpf_type",
-                value: "BIQUAD", 
-                allow_reset: true
+                value: "BIQUAD"
             },
             {
                 key: "dynamic_gyro_notch_enabled",
-                value: "ON", 
-                allow_reset: true
+                value: "ON"
             },
             {
                 key: "dynamic_gyro_notch_q",
-                value: 250, 
-                allow_reset: true
+                value: 250
             },
             {
                 key: "dynamic_gyro_notch_min_hz",
-                value: 30, 
-                allow_reset: true
+                value: 30
             },
             {
                 key: "motor_pwm_protocol",
-                value: "STANDARD", 
-                allow_reset: false
+                value: "STANDARD"
             },
             {
                 key: "throttle_idle",
-                value: 5.0, 
-                allow_reset: false
+                value: 5.0
             },
             {
                 key: "rc_yaw_expo",
-                value: 30, 
-                allow_reset: false
+                value: 30
             },
             {
                 key: "rc_expo",
-                value: 30, 
-                allow_reset: false
+                value: 30
             },
             {
                 key: "roll_rate",
-                value: 18, 
-                allow_reset: true
+                value: 18
             },
             {
                 key: "pitch_rate",
-                value: 9, 
-                allow_reset: true
+                value: 9
             },
             {
                 key: "yaw_rate",
-                value: 3, 
-                allow_reset: true
+                value: 3
             },
             {
                 key: "nav_fw_pos_z_p",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "nav_fw_pos_z_d",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "nav_fw_pos_xy_p",
-                value: 60, 
-                allow_reset: true
+                value: 60
             },
             {
                 key: "fw_turn_assist_pitch_gain",
-                value: 0.2, 
-                allow_reset: true
+                value: 0.2
             },
             {
                 key: "max_angle_inclination_rll",
-                value: 550, 
-                allow_reset: true
+                value: 550
             },
             {
                 key: "nav_fw_bank_angle",
-                value: 45, 
-                allow_reset: true
+                value: 45
             },
             {
                 key: "fw_p_pitch",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "fw_i_pitch",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
-            {
+                        {
                 key: "fw_d_pitch",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "fw_ff_pitch",
-                value: 70, 
-                allow_reset: true
+                value: 70
             },
             {
                 key: "fw_p_roll",
-                value: 15, 
-                allow_reset: true
+                value: 15
             },
             {
                 key: "fw_i_roll",
-                value: 3, 
-                allow_reset: true
+                value: 3
             },
             {
                 key: "fw_d_roll",
-                value: 7, 
-                allow_reset: true
+                value: 7
             },
             {
                 key: "fw_ff_roll",
-                value: 50, 
-                allow_reset: true
+                value: 50
             },
             {
                 key: "fw_p_yaw",
-                value: 20, 
-                allow_reset: true
+                value: 20
             },
             {
                 key: "fw_i_yaw",
-                value: 0, 
-                allow_reset: true
+                value: 0
             },
             {
                 key: "fw_d_yaw",
-                value: 0, 
-                allow_reset: true
+                value: 0
             },
             {
                 key: "fw_ff_yaw",
-                value: 100, 
-                allow_reset: true
+                value: 100
             },
             {
                 key: "imu_acc_ignore_rate",
-                value: 9, 
-                allow_reset: true
+                value: 9
             },
             {
                 key: "imu_acc_ignore_slope",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "airmode_type",
-                value: "STICK_CENTER_ONCE", 
-                allow_reset: true
+                value: "STICK_CENTER_ONCE"
             },
             {
                 key: "small_angle",
-                value: 180, 
-                allow_reset: true
+                value: 180
             },
             {
                 key: "nav_fw_control_smoothness",
-                value: 2, 
-                allow_reset: true
+                value: 2
             },
             {
                 key: "nav_rth_allow_landing",
-                value: "FS_ONLY", 
-                allow_reset: false
+                value: "FS_ONLY"
             },
             {
                 key: "nav_rth_altitude",
-                value: 5000, 
-                allow_reset: false
+                value: 5000
             },
             {
                 key: "failsafe_mission",
-                value: "ON", 
-                allow_reset: false
+                value: "ON"
             },
             {
                 key: "nav_wp_radius",
-                value: 5000, 
-                allow_reset: false
+                value: 5000
             },
         ],
         "features": [
@@ -742,78 +609,63 @@ helper.defaultsDialog = (function () {
         "settings": [
             {
                 key: "model_preview_type",
-                value: 31, 
-                allow_reset: false
+                value: 31
             },
             {
                 key: "gyro_hardware_lpf",
-                value: "256HZ", 
-                allow_reset: true
+                value: "256HZ"
             },
             {
                 key: "gyro_main_lpf_hz",
-                value: 10, 
-                allow_reset: true
+                value: 10
             },
             {
                 key: "gyro_main_lpf_type",
-                value: "BIQUAD", 
-                allow_reset: true
+                value: "BIQUAD"
             },
             {
                 key: "motor_pwm_protocol",
-                value: "STANDARD", 
-                allow_reset: false
+                value: "STANDARD"
             },
             {
                 key: "applied_defaults",
-                value: 1, 
-                allow_reset: false
+                value: 1
             },
             {
                 key: "failsafe_procedure",
-                value: "DROP", 
-                allow_reset: false
+                value: "DROP"
             },
             {
                 key: "platform_type",
-                value: "ROVER", 
-                allow_reset: false
+                value: "ROVER"
             },
             {
                 key: "nav_wp_safe_distance",
-                value: 50000, 
-                allow_reset: false
+                value: 50000
             },
             {
                 key: "nav_fw_loiter_radius",
-                value: 100, 
-                allow_reset: false
+                value: 100
             },
             {
                 key: "nav_fw_yaw_deadband",
-                value: 5, 
-                allow_reset: true
+                value: 5
             },
             {
                 key: "pidsum_limit_yaw",
-                value: 500, 
-                allow_reset: true
+                value: 500
             },
             {
                 key: "nav_fw_pos_hdg_p",
-                value: 60, 
-                allow_reset: true
+                value: 60
             },
             {
                 key: "nav_fw_pos_hdg_i",
-                value: 2, 
-                allow_reset: true
+                value: 2
             },
             {
                 key: "nav_fw_pos_hdg_d",
-                value: 0, 
-                allow_reset: true
+                value: 0
             }
         ]
     },
@@ -825,8 +677,7 @@ helper.defaultsDialog = (function () {
         "settings": [
             {
                 key: "applied_defaults",
-                value: 1, 
-                allow_reset: false
+                value: 1
             }
         ]
     }
@@ -867,12 +718,7 @@ helper.defaultsDialog = (function () {
                 GUI.tab_switch_cleanup(function () {
                     MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false, function () {
                         //noinspection JSUnresolvedVariable
-                        if (savingDefaultsModal) {
-                            savingDefaultsModal.close();
-                        }
-                        if (resettingPIDsModal) {
-                            resettingPIDsModal.close();
-                        }
+                        savingDefaultsModal.close();
                         GUI.log(chrome.i18n.getMessage('deviceRebooting'));
                         GUI.handleReconnect();
                     });
@@ -883,14 +729,14 @@ helper.defaultsDialog = (function () {
 
     privateScope.setSettings = function (selectedDefaultPreset) {
         //Save analytics
-        var currentProfile = parseInt($("#profilechange").val());
         googleAnalytics.sendEvent('Setting', 'Defaults', selectedDefaultPreset.title);
         Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
             return mspHelper.getSetting(input.key);
         }).then(function () {
             Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
-                return privateScope.setSetting(input.key, input.value);
+                return mspHelper.setSetting(input.key, input.value);
             }).then(function () {
+
                 // If default preset is associated to a mixer, apply the mixer as well
                 if (selectedDefaultPreset.mixerToApply) {
                     let currentMixerPreset = helper.mixer.getById(selectedDefaultPreset.mixerToApply);
@@ -905,60 +751,17 @@ helper.defaultsDialog = (function () {
 
                     mspHelper.sendServoMixer(function () {
                         mspHelper.sendMotorMixer(function () {
-                            MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentProfile], false, privateScope.finalize(selectedDefaultPreset));
+                            privateScope.finalize(selectedDefaultPreset);
                         })
                     });
                 } else {
-                    MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentProfile], false, privateScope.finalize(selectedDefaultPreset));
+                    privateScope.finalize(selectedDefaultPreset);
                 }
-            })
-        });
-    };
-
-    publicScope.resetSettings = function () {
-        mspHelper.getSetting("applied_defaults").then(function(aD) {
-            let selectedDefaultPreset = privateScope.getDefaults(aD.value);
 
-            if (selectedDefaultPreset && selectedDefaultPreset.settings) {
-                Promise.mapSeries(selectedDefaultPreset.settings, function (input) {
-                    return mspHelper.getSetting(input.key);
-                }).then(function () {
-                    Promise.mapSeries(selectedDefaultPreset.settings, function (input) {
-                        if (input.allow_reset) {
-                            return mspHelper.setSetting(input.key, input.value);
-                        }
-                    }).then(setTimeout( function() { 
-                        privateScope.finalize(selectedDefaultPreset);
-                    }, 6000));
-                });
-            }
-        }); 
-    };
+                
 
-    privateScope.setSetting = function (key, value) {
-        MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [0], false, function () {
-            mspHelper.setSetting(key, value, function() {
-                MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [1], false, function () {
-                    mspHelper.setSetting(key, value, function() {
-                        MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [2], false, function () {
-                            mspHelper.setSetting(key, value);
-                        });
-                    });
-                });
-            });
-        });
-        return;
-    };
-
-    privateScope.getDefaults = function(defaultsID) {
-        let defaults = null; 
-        data.forEach(function(dataSetting) {
-            if (dataSetting.id == defaultsID) {
-                defaults = dataSetting;
-            }
+            })
         });
-
-        return defaults;
     };
 
     privateScope.onPresetClick = function (event) {
diff --git a/main.css b/main.css
index aea3ff21..1c13dbf8 100644
--- a/main.css
+++ b/main.css
@@ -2163,13 +2163,13 @@ select {
     text-align: center;
 }
 
-#modal-saving-defaults, #modal-resetting-pids {
+#modal-saving-defaults {
     /* width: 100%; */
     height: 90px;
     background: url(../images/loading-bars.svg) no-repeat center 100%;
 }
 
-#modal-saving-defaults div, #modal-resetting-pids div {
+#modal-saving-defaults div {
     text-align: center;
 }
 
diff --git a/main.html b/main.html
index 608bc064..71da7b46 100755
--- a/main.html
+++ b/main.html
@@ -301,9 +301,6 @@
     <div id="modal-saving-defaults" class="is-hidden">
         <div data-i18n="savingDefaults"></div>
     </div>
-    <div id="modal-resetting-pids" class="is-hidden">
-        <div data-i18n="resettingPIDs"></div>
-    </div>
     <div id="defaults-wrapper" style="display: none">
         <div class="defaults-dialog__background"></div>
         <div class="defaults-dialog__content">
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 1969efe9..486090eb 100644
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -93,7 +93,6 @@ TABS.pid_tuning.initialize = function (callback) {
         RC_tuning.manual_pitch_rate = $('#rate-manual-pitch').val();
         RC_tuning.manual_yaw_rate = $('#rate-manual-yaw').val();
     }
-
     function hideUnusedPids(sensors_detected) {
       $('.tab-pid_tuning table.pid_tuning').hide();
       $('#pid_main').show();
@@ -114,7 +113,6 @@ TABS.pid_tuning.initialize = function (callback) {
         $('#pid_baro').show();
       }
     }
-
     function process_html() {
         // translate to user-selected language
         localize();
@@ -137,24 +135,16 @@ TABS.pid_tuning.initialize = function (callback) {
         });
 
         $('#resetPIDs').on('click', function() {
+
             if (confirm(chrome.i18n.getMessage('confirm_reset_pid'))) {
-                resettingPIDsModal = new jBox('Modal', {
-                    width: 400,
-                    height: 100,
-                    animation: false,
-                    closeOnClick: false,
-                    closeOnEsc: false,
-                    content: $('#modal-resetting-pids')
-                }).open();
-
-                helper.defaultsDialog.resetSettings();
+                MSP.send_message(MSPCodes.MSP_SET_RESET_CURR_PID, false, false, false);
+                updateActivatedTab();
             }
         });
 
         $('#resetDefaults').on('click', function() {
+
             if (confirm(chrome.i18n.getMessage('confirm_select_defaults'))) {
-                helper.features.reset();
-                helper.features.fromUI($('.tab-pid_tuning'));
                 mspHelper.setSetting("applied_defaults", 0, function() { 
                     mspHelper.saveToEeprom( function () {
                         GUI.log(chrome.i18n.getMessage('configurationEepromSaved'));