diff --git a/source/Core/Inc/configuration.h b/source/Core/Inc/configuration.h
index 28508de3..f8eccd12 100644
--- a/source/Core/Inc/configuration.h
+++ b/source/Core/Inc/configuration.h
@@ -111,6 +111,10 @@
 
 #define OP_AMP_GAIN_STAGE_TS80 (1 + (OP_AMP_Rf_TS80 / OP_AMP_Rin_TS80))
 
+#define OP_AMP_Rf_MHP30  268500   //  268.5  Kilo-ohms -> Measured
+#define OP_AMP_Rin_MHP30 1600     //  1.6  Kilo-ohms -> Measured
+
+#define OP_AMP_GAIN_STAGE_MHP30 (1 + (OP_AMP_Rf_MHP30 / OP_AMP_Rin_MHP30))
 // Deriving the Voltage div:
 // Vin_max = (3.3*(r1+r2))/(r2)
 // vdiv = (32768*4)/(vin_max*10)
@@ -164,14 +168,14 @@
 #endif
 
 #ifdef MODEL_MHP30
-#define VOLTAGE_DIV          352                     // Default for MHP30
+#define VOLTAGE_DIV          355                     // Default for MHP30
 #define PID_POWER_LIMIT      65                      // Sets the max pwm power limit
 #define CALIBRATION_OFFSET   700                     // the adc offset in uV
 #define POWER_LIMIT          65                      // 65 watts default power limit
 #define MAX_POWER_LIMIT      65                      //
 #define POWER_LIMIT_STEPS    2                       //
-#define OP_AMP_GAIN_STAGE    OP_AMP_GAIN_STAGE_TS100 // TODO
-#define TEMP_uV_LOOKUP_MHP30                         // TODO
+#define OP_AMP_GAIN_STAGE    OP_AMP_GAIN_STAGE_MHP30 //
+#define TEMP_uV_LOOKUP_MHP30                         //
 #define USB_PD_VMAX          20                      // Maximum voltage for PD to negotiate
 #endif
 
@@ -196,6 +200,6 @@ const uint8_t  tipResistance = 45; // x10 ohms, 4.5 typical for ts80 tips
 #endif
 
 #ifdef MODEL_MHP30
-const uint32_t tipMass       = 100; // TODO
-const uint8_t  tipResistance = 75;  // x10 ohms, ~6 typical
+const uint32_t tipMass = 100; // TODO
+const uint8_t tipResistance = 75;  // x10 ohms, ~6 typical
 #endif