From 2aafc5b7b00639bcd8ff414d5c66afd706572004 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Feb 2018 15:27:06 -0600 Subject: [PATCH 1/3] Test POWER_SUPPLY and AUTO_POWER_CONTROL --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d40b1ee0..5cb0b0bf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,9 +90,10 @@ script: - opt_set TEMP_SENSOR_0 -2 - opt_set TEMP_SENSOR_1 1 - opt_set TEMP_SENSOR_BED 1 + - opt_set POWER_SUPPLY 1 - opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS - - opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_LED + - opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_LED AUTO_POWER_CONTROL - opt_enable AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE - opt_enable_adv FWRETRACT MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL - opt_set ABL_GRID_POINTS_X 16 From baaf79b75563397876e0f2574b8ecbd46866c929 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Feb 2018 15:30:29 -0600 Subject: [PATCH 2/3] Use signed for pin_t --- Marlin/fastio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/fastio.h b/Marlin/fastio.h index bbceaa6a3..0f7df9765 100644 --- a/Marlin/fastio.h +++ b/Marlin/fastio.h @@ -31,7 +31,7 @@ #include -typedef uint8_t pin_t; +typedef int8_t pin_t; #include From f6a73bbd848cc9291bfb84649ae32c21da3d1806 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Feb 2018 15:36:42 -0600 Subject: [PATCH 3/3] Patch Power class --- Marlin/power.cpp | 2 +- Marlin/power.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Marlin/power.cpp b/Marlin/power.cpp index e3af4406f..a2f231f69 100644 --- a/Marlin/power.cpp +++ b/Marlin/power.cpp @@ -50,7 +50,7 @@ bool Power::is_power_needed() { #endif if (X_ENABLE_READ == X_ENABLE_ON || Y_ENABLE_READ == Y_ENABLE_ON || Z_ENABLE_READ == Z_ENABLE_ON || - thermalManager.soft_pwm_bed > 0 + thermalManager.soft_pwm_amount_bed > 0 || E0_ENABLE_READ == E_ENABLE_ON // If any of the drivers are enabled... #if E_STEPPERS > 1 || E1_ENABLE_READ == E_ENABLE_ON diff --git a/Marlin/power.h b/Marlin/power.h index c61c64e6f..a5c7dba79 100644 --- a/Marlin/power.h +++ b/Marlin/power.h @@ -27,6 +27,8 @@ #ifndef POWER_H #define POWER_H +#include "types.h" + class Power { public: static void check();