Bladeren bron

Merge pull request #8460 from Bob-the-Kuhn/E0-autofan

2.0.x E0 auto fan fixes for LP1768
Bob-the-Kuhn 6 jaren geleden
bovenliggende
commit
1502b6ad8a
No account linked to committer's email address
1 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 6
    2
      Marlin/src/module/temperature.cpp

+ 6
- 2
Marlin/src/module/temperature.cpp Bestand weergeven

515
 #if HAS_AUTO_FAN
515
 #if HAS_AUTO_FAN
516
 
516
 
517
   void Temperature::checkExtruderAutoFans() {
517
   void Temperature::checkExtruderAutoFans() {
518
-    static const int8_t fanPin[] PROGMEM = { E0_AUTO_FAN_PIN, E1_AUTO_FAN_PIN, E2_AUTO_FAN_PIN, E3_AUTO_FAN_PIN, E4_AUTO_FAN_PIN };
518
+    static const pin_t fanPin[] PROGMEM = { E0_AUTO_FAN_PIN, E1_AUTO_FAN_PIN, E2_AUTO_FAN_PIN, E3_AUTO_FAN_PIN, E4_AUTO_FAN_PIN };
519
     static const uint8_t fanBit[] PROGMEM = {
519
     static const uint8_t fanBit[] PROGMEM = {
520
                     0,
520
                     0,
521
       AUTO_1_IS_0 ? 0 :               1,
521
       AUTO_1_IS_0 ? 0 :               1,
531
 
531
 
532
     uint8_t fanDone = 0;
532
     uint8_t fanDone = 0;
533
     for (uint8_t f = 0; f < COUNT(fanPin); f++) {
533
     for (uint8_t f = 0; f < COUNT(fanPin); f++) {
534
-      int8_t pin = pgm_read_byte(&fanPin[f]);
534
+      #ifdef ARDUINO
535
+        pin_t pin = pgm_read_byte(&fanPin[f]);
536
+      #else
537
+        pin_t pin = fanPin[f];
538
+      #endif
535
       const uint8_t bit = pgm_read_byte(&fanBit[f]);
539
       const uint8_t bit = pgm_read_byte(&fanBit[f]);
536
       if (pin >= 0 && !TEST(fanDone, bit)) {
540
       if (pin >= 0 && !TEST(fanDone, bit)) {
537
         uint8_t newFanSpeed = TEST(fanState, bit) ? EXTRUDER_AUTO_FAN_SPEED : 0;
541
         uint8_t newFanSpeed = TEST(fanState, bit) ? EXTRUDER_AUTO_FAN_SPEED : 0;

Laden…
Annuleren
Opslaan