diff options
| author | kliment <kliment.yanev@gmail.com> | 2012-03-30 01:11:32 -0700 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2012-03-30 01:11:32 -0700 |
| commit | e89142f6a27df0790f045f8962ded8ef426b9079 (patch) | |
| tree | 7ad72d2f2bb0c9ed41eb7d335f73fe2a62d12ac4 | |
| parent | b75a6ad79de2065d7c0d991d3cad251f2834b486 (diff) | |
| parent | 52f7f3040874dc8b2ef4b0d570f7fa9d0291dfc3 (diff) | |
Merge pull request #160 from kliment/master
Command M106 / M107
| -rw-r--r-- | Sprinter/Sprinter.h | 1 | ||||
| -rw-r--r-- | Sprinter/Sprinter.pde | 39 |
2 files changed, 37 insertions, 3 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index 9873843..66e6c59 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -91,6 +91,7 @@ typedef struct { void FlushSerialRequestResend(); void ClearToSend(); +void analogWrite_check(uint8_t check_pin, int val); void showString (PGM_P s); void manage_inactivity(byte debug); diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index 3cec6a5..db29bc8 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -558,6 +558,39 @@ int FreeRam1(void) } //------------------------------------------------ +//Function the check the Analog OUT pin for not using the Timer1 +//------------------------------------------------ +void analogWrite_check(uint8_t check_pin, int val) +{ + #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) + //Atmega168 / 328 can not useed OCR1A and OCR1B + //This are PINS PB1 / PB2 or on Ardurino D9 / D10 + if((check_pin != 9) && (check_pin != 10)) + { + analogWrite(check_pin, val); + } + #endif + + #if defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__) + //Atmega664P / 1284P can not useed OCR1A and OCR1B + //This are PINS PD4 / PD5 or on Ardurino D12 / D13 + if((check_pin != 12) && (check_pin != 13)) + { + analogWrite(check_pin, val); + } + #endif + + #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) + //Atmega1280 / 2560 can not useed OCR1A, OCR1B and OCR1C + //This are PINS PB5,PB6,PB7 or on Ardurino D11,D12,and D13 + if((check_pin != 11) && (check_pin != 12) && (check_pin != 13)) + { + analogWrite(check_pin, val); + } + #endif +} + +//------------------------------------------------ //Print a String from Flash to Serial (save RAM) //------------------------------------------------ void showString (PGM_P s) @@ -1502,16 +1535,16 @@ FORCE_INLINE void process_commands() if (code_seen('S')) { WRITE(FAN_PIN, HIGH); - //analogWrite(FAN_PIN, constrain(code_value(),0,255) ); + analogWrite_check(FAN_PIN, constrain(code_value(),0,255) ); } else { WRITE(FAN_PIN, HIGH); - //analogWrite(FAN_PIN, 255 ); + analogWrite_check(FAN_PIN, 255 ); } break; case 107: //M107 Fan Off - //analogWrite(FAN_PIN, 0); + analogWrite_check(FAN_PIN, 0); WRITE(FAN_PIN, LOW); break; #endif |