Quellcode durchsuchen

preliminiary implementation for the early heating finish.

Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
Bernhard vor 12 Jahren
Ursprung
Commit
59205ac5fc
3 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
  1. 2
    0
      Marlin/Configuration.h
  2. 2
    0
      Marlin/temperature.cpp
  3. 4
    2
      Marlin/temperature.h

+ 2
- 0
Marlin/Configuration.h Datei anzeigen

@@ -91,6 +91,8 @@
91 91
 // if CooldownNoWait is defined M109 will not wait for the cooldown to finish
92 92
 #define CooldownNoWait true
93 93
 
94
+// Heating is finished if a temperature close to this degree shift is reached
95
+#define HEATING_EARLY_FINISH_DEG_OFFSET 1 //Degree
94 96
 // PID settings:
95 97
 // Uncomment the following line to enable PID support.
96 98
   

+ 2
- 0
Marlin/temperature.cpp Datei anzeigen

@@ -43,6 +43,8 @@
43 43
 //===========================================================================
44 44
 int target_raw[3] = {0, 0, 0};
45 45
 int current_raw[3] = {0, 0, 0};
46
+int heatingtarget_raw[3]= {0, 0, 0};
47
+
46 48
 
47 49
 #ifdef PIDTEMP
48 50
   

+ 4
- 2
Marlin/temperature.h Datei anzeigen

@@ -41,6 +41,7 @@ int temp2analogBed(int celsius);
41 41
 float analog2temp(int raw);
42 42
 float analog2tempBed(int raw);
43 43
 extern int target_raw[3];  
44
+extern int heatingtarget_raw[3];
44 45
 extern int current_raw[3];
45 46
 extern float Kp,Ki,Kd,Kc;
46 47
 
@@ -79,6 +80,7 @@ FORCE_INLINE float degTargetBed() {   return analog2tempBed(target_raw[TEMPSENSO
79 80
 FORCE_INLINE void setTargetHotend0(const float &celsius) 
80 81
 {  
81 82
   target_raw[TEMPSENSOR_HOTEND_0]=temp2analog(celsius);
83
+  heatingtarget_raw[TEMPSENSOR_HOTEND_0]=temp2analog(celsius-HEATING_EARLY_FINISH_DEG_OFFSET);
82 84
   #ifdef PIDTEMP
83 85
     pid_setpoint = celsius;
84 86
   #endif //PIDTEMP
@@ -90,10 +92,10 @@ FORCE_INLINE float setTargetHotend(const float &celcius, uint8_t extruder){
90 92
 };
91 93
 FORCE_INLINE void setTargetBed(const float &celsius)     {  target_raw[TEMPSENSOR_BED     ]=temp2analogBed(celsius);};
92 94
 
93
-FORCE_INLINE bool isHeatingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];};
95
+FORCE_INLINE bool isHeatingHotend0() {return heatingtarget_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];};
94 96
 FORCE_INLINE bool isHeatingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];};
95 97
 FORCE_INLINE float isHeatingHotend(uint8_t extruder){  
96
-  if(extruder == 0) return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];
98
+  if(extruder == 0) return heatingtarget_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];
97 99
   if(extruder == 1) return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];
98 100
 };
99 101
 FORCE_INLINE bool isHeatingBed() {return target_raw[TEMPSENSOR_BED] > current_raw[TEMPSENSOR_BED];};

Laden…
Abbrechen
Speichern