Browse Source

Fix: Use of digitalRead, digitalWrite breaks on AT90USB

Scott Lahteine 8 years ago
parent
commit
c7732db99d
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/Marlin_main.cpp

+ 7
- 7
Marlin/Marlin_main.cpp View File

5854
         WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);  // turn spindle off
5854
         WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);  // turn spindle off
5855
         delay_for_power_down();
5855
         delay_for_power_down();
5856
       }
5856
       }
5857
-      digitalWrite(SPINDLE_DIR_PIN, rotation_dir);
5857
+      WRITE(SPINDLE_DIR_PIN, rotation_dir);
5858
     #endif
5858
     #endif
5859
 
5859
 
5860
     /**
5860
     /**
6569
       for (uint8_t i = 0; i < 4; i++) {
6569
       for (uint8_t i = 0; i < 4; i++) {
6570
         servo[probe_index].move(z_servo_angle[0]); //deploy
6570
         servo[probe_index].move(z_servo_angle[0]); //deploy
6571
         safe_delay(500);
6571
         safe_delay(500);
6572
-        deploy_state = digitalRead(PROBE_TEST_PIN);
6572
+        deploy_state = READ(PROBE_TEST_PIN);
6573
         servo[probe_index].move(z_servo_angle[1]); //stow
6573
         servo[probe_index].move(z_servo_angle[1]); //stow
6574
         safe_delay(500);
6574
         safe_delay(500);
6575
-        stow_state = digitalRead(PROBE_TEST_PIN);
6575
+        stow_state = READ(PROBE_TEST_PIN);
6576
       }
6576
       }
6577
       if (probe_inverting != deploy_state) SERIAL_PROTOCOLLNPGM("WARNING - INVERTING setting probably backwards");
6577
       if (probe_inverting != deploy_state) SERIAL_PROTOCOLLNPGM("WARNING - INVERTING setting probably backwards");
6578
 
6578
 
6607
           if (0 == j % (500 * 1)) // keep cmd_timeout happy
6607
           if (0 == j % (500 * 1)) // keep cmd_timeout happy
6608
             refresh_cmd_timeout();
6608
             refresh_cmd_timeout();
6609
 
6609
 
6610
-          if (deploy_state != digitalRead(PROBE_TEST_PIN)) { // probe triggered
6610
+          if (deploy_state != READ(PROBE_TEST_PIN)) { // probe triggered
6611
 
6611
 
6612
-            for (probe_counter = 1; probe_counter < 50 && deploy_state != digitalRead(PROBE_TEST_PIN); ++probe_counter)
6612
+            for (probe_counter = 1; probe_counter < 50 && deploy_state != READ(PROBE_TEST_PIN); ++probe_counter)
6613
               safe_delay(2);
6613
               safe_delay(2);
6614
 
6614
 
6615
             if (probe_counter == 50)
6615
             if (probe_counter == 50)
9876
       if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
9876
       if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
9877
         analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness );
9877
         analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness );
9878
       }
9878
       }
9879
-      else digitalWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH );
9879
+      else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH);
9880
     }
9880
     }
9881
-    else digitalWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? HIGH : LOW);
9881
+    else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? HIGH : LOW);
9882
   }
9882
   }
9883
 #endif // HAS_CASE_LIGHT
9883
 #endif // HAS_CASE_LIGHT
9884
 
9884
 

Loading…
Cancel
Save