From: Bernhard <bkubicek@x201.(none)>
Date: Mon, 28 Nov 2011 20:36:01 +0000 (+0100)
Subject: Merge branch 'smallopt' into Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~180
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=311627141bff077a4c5ac6e602fcf6d1c7ae22ca;p=marlin.git

Merge branch 'smallopt' into Marlin_v1

Conflicts:
	Marlin/temperature.h
---

311627141bff077a4c5ac6e602fcf6d1c7ae22ca
diff --cc Marlin/Marlin.h
index 57f403d,69a0cf3..464d7eb
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@@ -8,8 -7,9 +8,10 @@@
  #include "fastio.h"
  #include <avr/pgmspace.h>
  #include "Configuration.h"
 +#include "MarlinSerial.h"
  
+ 
+ #define  FORCE_INLINE __attribute__((always_inline)) inline
  //#define SERIAL_ECHO(x) Serial << "echo: " << x;
  //#define SERIAL_ECHOLN(x) Serial << "echo: "<<x<<endl;
  //#define SERIAL_ERROR(x) Serial << "Error: " << x;
diff --cc Marlin/temperature.h
index e832eb6,9057c1c..3f38c81
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@@ -59,52 -59,31 +59,52 @@@ extern float Kp,Ki,Kd,Kc
  //inline so that there is no performance decrease.
  //deg=degreeCelsius
  
- inline float degHotend0(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_0]);};
- inline float degHotend1(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_1]);};
- inline float degBed() {  return analog2tempBed(current_raw[TEMPSENSOR_BED]);};
+ FORCE_INLINE float degHotend0(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_0]);};
+ FORCE_INLINE float degHotend1(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_1]);};
+ FORCE_INLINE float degBed() {  return analog2tempBed(current_raw[TEMPSENSOR_BED]);};
 +inline float degHotend(uint8_t extruder){  
 +  if(extruder == 0) return analog2temp(current_raw[TEMPSENSOR_HOTEND_0]);
 +  if(extruder == 1) return analog2temp(current_raw[TEMPSENSOR_HOTEND_1]);
 +};
  
- inline float degTargetHotend0() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_0]);};
- inline float degTargetHotend1() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_1]);};
+ FORCE_INLINE float degTargetHotend0() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_0]);};
+ FORCE_INLINE float degTargetHotend1() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_1]);};
 -FORCE_INLINE float degTargetBed() {   return analog2tempBed(target_raw[TEMPSENSOR_BED]);};
 +inline float degTargetHotend(uint8_t extruder){  
 +  if(extruder == 0) return analog2temp(target_raw[TEMPSENSOR_HOTEND_0]);
 +  if(extruder == 1) return analog2temp(target_raw[TEMPSENSOR_HOTEND_1]);
 +};
 +
 +inline float degTargetBed() {   return analog2tempBed(target_raw[TEMPSENSOR_BED]);};
  
- inline void setTargetHotend0(const float &celsius) 
+ FORCE_INLINE void setTargetHotend0(const float &celsius) 
  {  
    target_raw[TEMPSENSOR_HOTEND_0]=temp2analog(celsius);
    #ifdef PIDTEMP
      pid_setpoint = celsius;
    #endif //PIDTEMP
  };
- inline void setTargetHotend1(const float &celsius) {  target_raw[TEMPSENSOR_HOTEND_1]=temp2analog(celsius);};
+ FORCE_INLINE void setTargetHotend1(const float &celsius) {  target_raw[TEMPSENSOR_HOTEND_1]=temp2analog(celsius);};
 -FORCE_INLINE void setTargetBed(const float &celsius)     {  target_raw[TEMPSENSOR_BED     ]=temp2analogBed(celsius);};
 +inline float setTargetHotend(const float &celcius, uint8_t extruder){  
 +  if(extruder == 0) setTargetHotend0(celcius);
 +  if(extruder == 1) setTargetHotend1(celcius);
 +};
 +inline void setTargetBed(const float &celsius)     {  target_raw[TEMPSENSOR_BED     ]=temp2analogBed(celsius);};
  
- inline bool isHeatingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];};
- inline bool isHeatingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];};
+ FORCE_INLINE bool isHeatingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];};
+ FORCE_INLINE bool isHeatingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];};
 -FORCE_INLINE bool isHeatingBed() {return target_raw[TEMPSENSOR_BED] > current_raw[TEMPSENSOR_BED];};
 +inline float isHeatingHotend(uint8_t extruder){  
 +  if(extruder == 0) return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];
 +  if(extruder == 1) return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];
 +};
 +inline bool isHeatingBed() {return target_raw[TEMPSENSOR_BED] > current_raw[TEMPSENSOR_BED];};
  
- inline bool isCoolingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] < current_raw[TEMPSENSOR_HOTEND_0];};
- inline bool isCoolingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];};
+ FORCE_INLINE bool isCoolingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] < current_raw[TEMPSENSOR_HOTEND_0];};
+ FORCE_INLINE bool isCoolingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];};
 -FORCE_INLINE bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];};
 +inline float isCoolingHotend(uint8_t extruder){  
 +  if(extruder == 0) return target_raw[TEMPSENSOR_HOTEND_0] < current_raw[TEMPSENSOR_HOTEND_0];
 +  if(extruder == 1) return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];
 +};
 +inline bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];};
  
  void disable_heater();
  void setWatch();