浏览代码

clean up and changes from testing

Mark Finn 11 年前
父节点
当前提交
d197f8504b
共有 2 个文件被更改,包括 8 次插入5 次删除
  1. 3
    4
      Marlin/Marlin.pde
  2. 5
    1
      Marlin/temperature.cpp

+ 3
- 4
Marlin/Marlin.pde 查看文件

1000
         SERIAL_ERROR_START;
1000
         SERIAL_ERROR_START;
1001
         SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
1001
         SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS);
1002
       #endif
1002
       #endif
1003
-      #ifdef PIDTEMP
1003
+
1004
         SERIAL_PROTOCOLPGM(" @:");
1004
         SERIAL_PROTOCOLPGM(" @:");
1005
         SERIAL_PROTOCOL(getHeaterPower(tmp_extruder));  
1005
         SERIAL_PROTOCOL(getHeaterPower(tmp_extruder));  
1006
-      #endif
1007
-      #ifdef PIDTEMPBED
1006
+
1008
         SERIAL_PROTOCOLPGM(" B@:");
1007
         SERIAL_PROTOCOLPGM(" B@:");
1009
         SERIAL_PROTOCOL(getHeaterPower(-1));  
1008
         SERIAL_PROTOCOL(getHeaterPower(-1));  
1010
-      #endif
1009
+
1011
         SERIAL_PROTOCOLLN("");
1010
         SERIAL_PROTOCOLLN("");
1012
       return;
1011
       return;
1013
       break;
1012
       break;

+ 5
- 1
Marlin/temperature.cpp 查看文件

99
   static float pid_error_bed;
99
   static float pid_error_bed;
100
   static float temp_iState_min_bed;
100
   static float temp_iState_min_bed;
101
   static float temp_iState_max_bed;
101
   static float temp_iState_max_bed;
102
+#else //PIDTEMPBED
103
+	static unsigned long  previous_millis_bed_heater;
102
 #endif //PIDTEMPBED
104
 #endif //PIDTEMPBED
103
   static unsigned char soft_pwm[EXTRUDERS];
105
   static unsigned char soft_pwm[EXTRUDERS];
104
   static unsigned char soft_pwm_bed;
106
   static unsigned char soft_pwm_bed;
640
 #ifdef PIDTEMP
642
 #ifdef PIDTEMP
641
     temp_iState_min[e] = 0.0;
643
     temp_iState_min[e] = 0.0;
642
     temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
644
     temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
645
+#endif //PIDTEMP
646
+#ifdef PIDTEMPBED
643
     temp_iState_min_bed = 0.0;
647
     temp_iState_min_bed = 0.0;
644
     temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
648
     temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
645
-#endif //PIDTEMP
649
+#endif //PIDTEMPBED
646
   }
650
   }
647
 
651
 
648
   #if (HEATER_0_PIN > -1) 
652
   #if (HEATER_0_PIN > -1) 

正在加载...
取消
保存