MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert measurement loop

Browse Source
This commit is contained in:
Scott Lahteine 2015-03-23 15:18:22 -07:00
parent 6bdee87be3
commit 1fac388664
1 changed files with 77 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
Marlin/temperature.cpp
View File

@ -1145,28 +1145,28 @@ void disable_heater() {
for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i); for (int i=0; i<EXTRUDERS; i++) setTargetHotend(0, i);
setTargetBed(0); setTargetBed(0);
#define DISABLE_HEATER(NR) { \
target_temperature[NR] = 0; \
soft_pwm[NR] = 0; \
WRITE_HEATER_ ## NR (LOW); \
}
#if HAS_TEMP_0 #if HAS_TEMP_0
target_temperature[0] = 0; target_temperature[0] = 0;
soft_pwm[0] = 0; soft_pwm[0] = 0;
WRITE_HEATER_0P(LOW); // If HEATERS_PARALLEL should apply, change to WRITE_HEATER_0 WRITE_HEATER_0P(LOW); // Should HEATERS_PARALLEL apply here? Then change to DISABLE_HEATER(0)
#endif #endif
#if EXTRUDERS > 1 && HAS_TEMP_1 #if EXTRUDERS > 1 && HAS_TEMP_1
target_temperature[1] = 0; DISABLE_HEATER(1);
soft_pwm[1] = 0;
WRITE_HEATER_1(LOW);
#endif #endif
#if EXTRUDERS > 2 && HAS_TEMP_2 #if EXTRUDERS > 2 && HAS_TEMP_2
target_temperature[2] = 0; DISABLE_HEATER(2);
soft_pwm[2] = 0;
WRITE_HEATER_2(LOW);
#endif #endif
#if EXTRUDERS > 3 && HAS_TEMP_3 #if EXTRUDERS > 3 && HAS_TEMP_3
target_temperature[3] = 0; DISABLE_HEATER(3);
soft_pwm[3] = 0;
WRITE_HEATER_3(LOW);
#endif #endif
#if HAS_TEMP_BED #if HAS_TEMP_BED
@ -1240,26 +1240,16 @@ void disable_heater() {
enum TempState { enum TempState {
PrepareTemp_0, PrepareTemp_0,
MeasureTemp_0, MeasureTemp_0,
#if HAS_TEMP_BED PrepareTemp_BED,
PrepareTemp_BED, MeasureTemp_BED,
MeasureTemp_BED, PrepareTemp_1,
#endif MeasureTemp_1,
#if HAS_TEMP_1 PrepareTemp_2,
PrepareTemp_1, MeasureTemp_2,
MeasureTemp_1, PrepareTemp_3,
#endif MeasureTemp_3,
#if HAS_TEMP_2 Prepare_FILWIDTH,
PrepareTemp_2, Measure_FILWIDTH,
MeasureTemp_2,
#endif
#if HAS_TEMP_3
PrepareTemp_3,
MeasureTemp_3,
#endif
#if HAS_FILAMENT_SENSOR
Prepare_FILWIDTH,
Measure_FILWIDTH,
#endif
StartupDelay // Startup, delay initial temp reading a tiny bit so the hardware can settle StartupDelay // Startup, delay initial temp reading a tiny bit so the hardware can settle
}; };
@ -1483,123 +1473,83 @@ ISR(TIMER0_COMPB_vect) {
#if HAS_TEMP_0 #if HAS_TEMP_0
raw_temp_value[0] += ADC; raw_temp_value[0] += ADC;
#endif #endif
temp_state = temp_state = PrepareTemp_BED;
#if HAS_TEMP_BED
PrepareTemp_BED
#elif HAS_TEMP_1
PrepareTemp_1
#elif HAS_TEMP_2
PrepareTemp_2
#elif HAS_TEMP_3
PrepareTemp_3
#elif HAS_FILAMENT_SENSOR
Prepare_FILWIDTH
#else
PrepareTemp_0
#endif
;
break; break;
#if HAS_TEMP_BED case PrepareTemp_BED:
case PrepareTemp_BED: #if HAS_TEMP_BED
START_ADC(TEMP_BED_PIN); START_ADC(TEMP_BED_PIN);
lcd_buttons_update(); #endif
temp_state = MeasureTemp_BED; lcd_buttons_update();
break; temp_state = MeasureTemp_BED;
case MeasureTemp_BED: break;
case MeasureTemp_BED:
#if HAS_TEMP_BED
raw_temp_bed_value += ADC; raw_temp_bed_value += ADC;
temp_state = #endif
#if HAS_TEMP_1 temp_state = PrepareTemp_1;
PrepareTemp_1 break;
#elif HAS_TEMP_2
PrepareTemp_2
#elif HAS_TEMP_3
PrepareTemp_3
#elif HAS_FILAMENT_SENSOR
Prepare_FILWIDTH
#else
PrepareTemp_0
#endif
;
break;
#endif
#if HAS_TEMP_1 case PrepareTemp_1:
case PrepareTemp_1: #if HAS_TEMP_1
START_ADC(TEMP_1_PIN); START_ADC(TEMP_1_PIN);
lcd_buttons_update(); #endif
temp_state = MeasureTemp_1; lcd_buttons_update();
break; temp_state = MeasureTemp_1;
case MeasureTemp_1: break;
case MeasureTemp_1:
#if HAS_TEMP_1
raw_temp_value[1] += ADC; raw_temp_value[1] += ADC;
temp_state = #endif
#if HAS_TEMP_2 temp_state = PrepareTemp_2;
PrepareTemp_2 break;
#elif HAS_TEMP_3
PrepareTemp_3
#elif HAS_FILAMENT_SENSOR
Prepare_FILWIDTH
#else
PrepareTemp_0
#endif
;
break;
#endif
#if HAS_TEMP_2 case PrepareTemp_2:
case PrepareTemp_2: #if HAS_TEMP_2
START_ADC(TEMP_2_PIN); START_ADC(TEMP_2_PIN);
lcd_buttons_update(); #endif
temp_state = MeasureTemp_2; lcd_buttons_update();
break; temp_state = MeasureTemp_2;
case MeasureTemp_2: break;
case MeasureTemp_2:
#if HAS_TEMP_2
raw_temp_value[2] += ADC; raw_temp_value[2] += ADC;
temp_state = #endif
#if HAS_TEMP_3 temp_state = PrepareTemp_3;
PrepareTemp_3 break;
#elif HAS_FILAMENT_SENSOR
Prepare_FILWIDTH
#else
PrepareTemp_0
#endif
;
break;
#endif
#if HAS_TEMP_3 case PrepareTemp_3:
case PrepareTemp_3: #if HAS_TEMP_3
START_ADC(TEMP_3_PIN); START_ADC(TEMP_3_PIN);
lcd_buttons_update(); #endif
temp_state = MeasureTemp_3; lcd_buttons_update();
break; temp_state = MeasureTemp_3;
case MeasureTemp_3: break;
case MeasureTemp_3:
#if HAS_TEMP_3
raw_temp_value[3] += ADC; raw_temp_value[3] += ADC;
temp_state = #endif
#if HAS_FILAMENT_SENSOR temp_state = Prepare_FILWIDTH;
Prepare_FILWIDTH break;
#else
PrepareTemp_0
#endif
;
break;
#endif
#if HAS_FILAMENT_SENSOR case Prepare_FILWIDTH:
case Prepare_FILWIDTH: #if HAS_FILAMENT_SENSOR
START_ADC(FILWIDTH_PIN); START_ADC(FILWIDTH_PIN);
lcd_buttons_update(); #endif
temp_state = Measure_FILWIDTH; lcd_buttons_update();
break; temp_state = Measure_FILWIDTH;
case Measure_FILWIDTH: break;
case Measure_FILWIDTH:
#if HAS_FILAMENT_SENSOR
// raw_filwidth_value += ADC; //remove to use an IIR filter approach // raw_filwidth_value += ADC; //remove to use an IIR filter approach
if (ADC > 102) { //check that ADC is reading a voltage > 0.5 volts, otherwise don't take in the data. if (ADC > 102) { //check that ADC is reading a voltage > 0.5 volts, otherwise don't take in the data.
raw_filwidth_value -= (raw_filwidth_value>>7); //multiply raw_filwidth_value by 127/128 raw_filwidth_value -= (raw_filwidth_value>>7); //multiply raw_filwidth_value by 127/128
raw_filwidth_value += ((unsigned long)ADC<<7); //add new ADC reading raw_filwidth_value += ((unsigned long)ADC<<7); //add new ADC reading
} }
temp_state = PrepareTemp_0; #endif
temp_count++; temp_state = PrepareTemp_0;
break; temp_count++;
#endif break;
case StartupDelay: case StartupDelay:
temp_state = PrepareTemp_0; temp_state = PrepareTemp_0;