Merge pull request synthetos#268 from synthetos/dev-267-pb-settings

Updates to all Printrbot configurations. Fixes synthetos#267.
plato1976 · Apr 19, 2017 · 0a0e392 · 0a0e392
2 parents bed4f5f + da203c5
commit 0a0e392
Show file tree

Hide file tree

Showing 9 changed files with 906 additions and 909 deletions.
diff --git a/g2core/settings/settings_Printrbot_Play.h b/g2core/settings/settings_Printrbot_Play.h
diff --git a/g2core/settings/settings_Printrbot_Plus.h b/g2core/settings/settings_Printrbot_Plus.h
diff --git a/g2core/settings/settings_Printrbot_Simple_1403.h b/g2core/settings/settings_Printrbot_Simple_1403.h
diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h
diff --git a/g2core/settings/settings_Ultimaker.h b/g2core/settings/settings_Ultimaker.h
@@ -91,7 +91,7 @@
 #define M1_MICROSTEPS               8                       // 1mi        1,2,4,8,16,32
 #define M1_POLARITY                 1                       // 1po        0=normal, 1=reversed
 #define M1_POWER_MODE               MOTOR_POWER_MODE        // 1pm        standard
-#define M1_POWER_LEVEL              0.375                   // 1mp
+#define M1_POWER_LEVEL              0.375                   // 1pl:   0.0=no power, 1.0=max power
 
 #define M2_MOTOR_MAP                AXIS_Y
 #define M2_STEP_ANGLE               1.8

diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h
@@ -114,11 +114,11 @@
 #define COOLANT_PAUSE_ON_HOLD       true    // {coph:
 #endif
 
-#ifndef PROBE_REPORT_ENABLE 
-#define PROBE_REPORT_ENABLE         true    // {prbr: 
+#ifndef PROBE_REPORT_ENABLE
+#define PROBE_REPORT_ENABLE         true    // {prbr:
 #endif
 
-/* 
+/*
  * The following is to fix an issue where feedrate override was being defined in some users
  * settings files but not others. This would otherwise cause an undefined compile error.
  *
@@ -247,7 +247,7 @@
 #define M2_MICROSTEPS               8
 #endif
 #ifndef M2_STEPS_PER_UNIT
-#define M2_STEPS_PER_UNIT           0 
+#define M2_STEPS_PER_UNIT           0
 #endif
 #ifndef M2_POLARITY
 #define M2_POLARITY                 0

diff --git a/g2core/settings/settings_makeblock.h b/g2core/settings/settings_makeblock.h
@@ -89,7 +89,7 @@
                                                         // 1=MOTOR_ALWAYS_POWERED, 
                                                         // 2=MOTOR_POWERED_IN_CYCLE, 
                                                         // 3=MOTOR_POWERED_ONLY_WHEN_MOVING
-#define M1_POWER_LEVEL          0.4                     // 0.0 = off, 1.0 = max
+#define M1_POWER_LEVEL          0.4                     // 1pl:   0.0=no power, 1.0=max power
 #define MOTOR_POWER_TIMEOUT     10.00                    // motor power timeout in seconds
 
 #define M1_MOTOR_MAP            AXIS_X                  // 1ma

diff --git a/g2core/settings/settings_watercolorbot_v2.h b/g2core/settings/settings_watercolorbot_v2.h
@@ -96,7 +96,7 @@
 #define M1_MICROSTEPS               32                      // 1mi        1,2,4,8
 #define M1_POLARITY                 1                       // 1po        0=normal, 1=reversed
 #define M1_POWER_MODE               MOTOR_POWER_MODE        // 1pm        standard
-#define M1_POWER_LEVEL              0.4
+#define M1_POWER_LEVEL              0.4                     // 1pl:   0.0=no power, 1.0=max power
 
 #define M2_MOTOR_MAP                AXIS_X
 #define M2_STEP_ANGLE               1.8
@@ -116,7 +116,7 @@
 #define M3_MICROSTEPS               32                      // the max step resolution for a hobby servo is 1/32
 #define M3_POLARITY                 1
 #define M3_POWER_MODE               MOTOR_ALWAYS_POWERED
-#define M3_POWER_LEVEL              0.50                    // this is ignored
+#define M3_POWER_LEVEL              0.50
 
 #define M4_MOTOR_MAP                AXIS_A
 #define M4_STEP_ANGLE               1.8

diff --git a/g2core/settings/settings_zen7x12.h b/g2core/settings/settings_zen7x12.h
@@ -52,7 +52,7 @@
 #define M1_MICROSTEPS           8                       // 1mi        1,2,4,8
 #define M1_POLARITY             1                       // REVERSE// 1po        0=normal, 1=reverse
 #define M1_POWER_MODE           MOTOR_POWERED_IN_CYCLE  // 1pm        standard
-#define M1_POWER_LEVEL          0.5                     // 1mp
+#define M1_POWER_LEVEL          0.5                     // 1pl:   0.0=no power, 1.0=max power
 
 #define M2_MOTOR_MAP            AXIS_Y
 #define M2_STEP_ANGLE           1.8