Browse Source

Fix probe temp calibration (#16718)

Neskik 5 years ago
parent
commit
1db9d9f76f
No account linked to committer's email address

+ 3
- 3
Marlin/src/feature/probe_temp_compensation.h View File

48
   public:
48
   public:
49
 
49
 
50
     static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
50
     static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
51
-        {  30, 10,  5,  30 + 10 *  5 },       // Probe
52
-        {  60, 10,  5,  60 + 10 *  5 },       // Bed
51
+        {  10,  5,  30,  30 + 10 *  5 },       // Probe
52
+        {  10,  5,  60,  60 + 10 *  5 },       // Bed
53
       #if ENABLED(USE_TEMP_EXT_COMPENSATION)
53
       #if ENABLED(USE_TEMP_EXT_COMPENSATION)
54
-        { 180,  5, 20, 180 +  5 * 20 }        // Extruder
54
+        {  20,  5, 180, 180 +  5 * 20 }        // Extruder
55
       #endif
55
       #endif
56
     };
56
     };
57
     static const temp_calib_t cali_info[TSI_COUNT];
57
     static const temp_calib_t cali_info[TSI_COUNT];

+ 4
- 4
Marlin/src/gcode/calibrate/G76_M871.cpp View File

256
 
256
 
257
     // Initialize temperatures
257
     // Initialize temperatures
258
     uint16_t target_bed = temp_comp.probe_calib_bed_temp,
258
     uint16_t target_bed = temp_comp.probe_calib_bed_temp,
259
-             target_probe = temp_comp.cali_info_init[TSI_BED].start_temp;
259
+             target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
260
     thermalManager.setTargetBed(target_bed);
260
     thermalManager.setTargetBed(target_bed);
261
     SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
261
     SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
262
     while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
262
     while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
332
       else
332
       else
333
         SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
333
         SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
334
 
334
 
335
-      if (target_probe == temp_comp.cali_info_init[TSI_BED].start_temp)
335
+      if (target_probe == temp_comp.cali_info_init[TSI_PROBE].start_temp)
336
         temp_comp.prepare_new_calibration(measured_z);
336
         temp_comp.prepare_new_calibration(measured_z);
337
       else
337
       else
338
         temp_comp.push_back_new_measurement(TSI_PROBE, measured_z);
338
         temp_comp.push_back_new_measurement(TSI_PROBE, measured_z);
339
 
339
 
340
-      target_probe += temp_comp.cali_info_init[TSI_BED].temp_res;
341
-      if (target_probe > temp_comp.cali_info_init[TSI_BED].end_temp) break;
340
+      target_probe += temp_comp.cali_info_init[TSI_PROBE].temp_res;
341
+      if (target_probe > temp_comp.cali_info_init[TSI_PROBE].end_temp) break;
342
     }
342
     }
343
 
343
 
344
     SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
344
     SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());

Loading…
Cancel
Save