Add files via upload

RF1000community · Jul 30, 2017 · a3cce07 · a3cce07
1 parent cf14a63
commit a3cce07
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/README.de_DE.md b/README.de_DE.md
@@ -17,7 +17,7 @@ https://github.com/RF1000/Repetier-Firmware (siehe Branch developement)
 ## Installationsanleitung
 
 - Das Firmwarepaket `Branch: community_development` herunterladen und entpacken.  
-- Installiere Arduino.cc 1.6.5 or 1.8.1 oder später, wenn Arduino nicht bereits installiert ist.  
+- Installiere Arduino.cc 1.6.5 or 1.8.3 oder später, wenn Arduino nicht bereits installiert ist.  
 - Man bearbeitet und speichert die Configuration.h bei Zeile 46 und 47, je nachdem welchen Drucker man besitzt mit einem Texteditor. Man muss die zwei **//** vor dem Druckermodell entfernen, welches man aktivieren will:  
 `#define MOTHERBOARD                         DEVICE_TYPE_RF1000` or  
 `#define MOTHERBOARD                         DEVICE_TYPE_RF2000`

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ https://github.com/RF1000/Repetier-Firmware (see branch development)
 ## HowTo Install
 
 - Download the Firmware `Branch: community_development` and unzip all the files.  
-- Install Arduino.cc 1.6.5 or 1.8.1 and later if it is not installed on your computer already.  
+- Install Arduino.cc 1.6.5 or 1.8.3 and later if it is not installed on your computer already.  
 - Edit and save Configuration.h @Line46 and 47 according to your printers model. You have to remove the two **//** in front of the printers name you wish to activate:  
 `#define MOTHERBOARD                         DEVICE_TYPE_RF1000` or  
 `#define MOTHERBOARD                         DEVICE_TYPE_RF2000`

diff --git a/Repetier/HAL.cpp b/Repetier/HAL.cpp
@@ -1045,8 +1045,6 @@ ISR(PWM_TIMER_VECTOR)
 #if HEATED_BED_HEATER_PIN>-1 && HAVE_HEATED_BED
     if(pwm_heater_pos_set[NUM_EXTRUDER] == pwm_count_heater && pwm_heater_pos_set[NUM_EXTRUDER]!=HEATER_PWM_MASK) WRITE(HEATED_BED_HEATER_PIN,HEATER_PINS_INVERTED);
 #endif // HEATED_BED_HEATER_PIN>-1 && HAVE_HEATED_BED
-
-    HAL::allowInterrupts();
 
     counterPeriodical++; // Approximate a 100ms timer
     if(counterPeriodical>=(int)(F_CPU/40960))
@@ -1055,33 +1053,10 @@ ISR(PWM_TIMER_VECTOR)
         executePeriodical=1;
     }
 
-#if FEATURE_RGB_LIGHT_EFFECTS
-    if( (HAL::timeInMilliseconds() - Printer::RGBLightLastChange) > RGB_LIGHT_COLOR_CHANGE_SPEED )
-    {
-        char    change = 0;
-
-
-        Printer::RGBLightLastChange = HAL::timeInMilliseconds();
-
-        if( g_uRGBTargetR > g_uRGBCurrentR )        { g_uRGBCurrentR ++; change = 1; }
-        else if( g_uRGBTargetR < g_uRGBCurrentR )   { g_uRGBCurrentR --; change = 1; }
-        if( g_uRGBTargetG > g_uRGBCurrentG )        { g_uRGBCurrentG ++; change = 1; }
-        else if( g_uRGBTargetG < g_uRGBCurrentG )   { g_uRGBCurrentG --; change = 1; }
-        if( g_uRGBTargetB > g_uRGBCurrentB )        { g_uRGBCurrentB ++; change = 1; }
-        else if( g_uRGBTargetB < g_uRGBCurrentB )   { g_uRGBCurrentB --; change = 1; }
-
-        if( change )
-        {
-            setRGBLEDs( g_uRGBCurrentR, g_uRGBCurrentG, g_uRGBCurrentB );
-        }
-    }
-#endif // FEATURE_RGB_LIGHT_EFFECTS
-
     // read analog values
 #if ANALOG_INPUTS>0
     if((ADCSRA & _BV(ADSC))==0)   // Conversion finished?
     {
-        HAL::forbidInterrupts();
         osAnalogInputBuildup[osAnalogInputPos] += ADCW;
         if(++osAnalogInputCounter[osAnalogInputPos]>=_BV(ANALOG_INPUT_SAMPLE))
         {
@@ -1119,7 +1094,6 @@ ISR(PWM_TIMER_VECTOR)
             ADMUX = (ADMUX & ~(0x1F)) | (channel & 7);
         }
         ADCSRA |= _BV(ADSC);  // start next conversion
-        HAL::allowInterrupts();
     }
 #endif // ANALOG_INPUTS>0
 
@@ -1128,6 +1102,26 @@ ISR(PWM_TIMER_VECTOR)
     pwm_count_cooler += COOLER_PWM_STEP;
     pwm_count_heater += HEATER_PWM_STEP;
 
+#if FEATURE_RGB_LIGHT_EFFECTS
+    if( (HAL::timeInMilliseconds() - Printer::RGBLightLastChange) > RGB_LIGHT_COLOR_CHANGE_SPEED )
+    {
+        char    change = 0;
+        Printer::RGBLightLastChange = HAL::timeInMilliseconds();
+
+        if( g_uRGBTargetR > g_uRGBCurrentR )        { g_uRGBCurrentR ++; change = 1; }
+        else if( g_uRGBTargetR < g_uRGBCurrentR )   { g_uRGBCurrentR --; change = 1; }
+        if( g_uRGBTargetG > g_uRGBCurrentG )        { g_uRGBCurrentG ++; change = 1; }
+        else if( g_uRGBTargetG < g_uRGBCurrentG )   { g_uRGBCurrentG --; change = 1; }
+        if( g_uRGBTargetB > g_uRGBCurrentB )        { g_uRGBCurrentB ++; change = 1; }
+        else if( g_uRGBTargetB < g_uRGBCurrentB )   { g_uRGBCurrentB --; change = 1; }
+
+        if( change )
+        {
+            setRGBLEDs( g_uRGBCurrentR, g_uRGBCurrentG, g_uRGBCurrentB );
+        }
+    }
+#endif // FEATURE_RGB_LIGHT_EFFECTS
+
     (void)pwm_cooler_pos_set;
     insideTimerPWM--;
 } // ISR(PWM_TIMER_VECTOR)