Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-21 10:35:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-introduced NORMALLY_OPEN (corresponds to IO_ACTIVE_LOW) and NORMALLY_CLOSED (corresponds to IO_ACTIVE_LOW) assignments. The NORMALLY_ forms are still used in some settings.h profiles, but are deprecated as depending on wiring a NC switch may be active LOW or HIGH. The NORMALLY_ terms will be removed in the upcoming GPIO Enhancements release.

Browse Source
This commit is contained in:
Alden Hart
2018-05-12 07:29:32 -04:00
parent 8220e3491f
commit d4fd75d485
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/g2core.cppproj
+4 -4
View File
@@ -68,12 +68,12 @@
<com_atmel_avrdbg_tool_atmelice>
<ToolOptions>
<InterfaceProperties>
<SwdClock>2000000</SwdClock>
<SwdClock>10000000</SwdClock>
</InterfaceProperties>
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
<ToolNumber>J41800021206</ToolNumber>
<ToolNumber>J41800004259</ToolNumber>
<ToolName>Atmel-ICE</ToolName>
</com_atmel_avrdbg_tool_atmelice>
<UseGdb>True</UseGdb>
@@ -100,9 +100,9 @@
<HWProgramCounterSampling>True</HWProgramCounterSampling>
</PercepioTrace>
<preserveEEPROM>true</preserveEEPROM>
<avrtoolserialnumber>J41800021206</avrtoolserialnumber>
<avrtoolserialnumber>J41800004259</avrtoolserialnumber>
<avrdeviceexpectedsignature>0x284E0A60</avrdeviceexpectedsignature>
<avrtoolinterfaceclock>2000000</avrtoolinterfaceclock>
<avrtoolinterfaceclock>10000000</avrtoolinterfaceclock>
<custom>
<ToolOptions xmlns="">
<InterfaceProperties>
g2core/gpio.h
+2 -2
View File
@@ -49,8 +49,8 @@ typedef enum {
IO_MODE_DISABLED = 2 // input is disabled
} ioMode;
#define IO_MODE_MAX IO_MODE_DISABLED
//#define NORMALLY_OPEN IO_ACTIVE_LOW // equivalent
//#define NORMALLY_CLOSED IO_ACTIVE_HIGH // equivalent
#define NORMALLY_OPEN IO_ACTIVE_LOW // equivalent
#define NORMALLY_CLOSED IO_ACTIVE_HIGH // equivalent
// *** NOTE: The active hi/low values currently agree with spindle and coolant values
// The above will all need to be changed to ACTIVE_HIGH = 0, ACTIVE_LOW = 1
g2core/settings/settings_makeblock.h
+6 -6
View File
@@ -88,13 +88,13 @@
// *** motor settings ************************************************************************************
#define MOTOR_POWER_LEVEL 0.2 // power level: 0.0=no power, 1.0=max power
#define MOTOR_POWER_MODE MOTOR_POWERED_IN_CYCLE // default motor power mode (see stPowerMode in stepper.h)
// 0=MOTOR_DISABLED,
// 1=MOTOR_ALWAYS_POWERED,
// 2=MOTOR_POWERED_IN_CYCLE,
// 3=MOTOR_POWERED_ONLY_WHEN_MOVING
#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 MOTOR_POWER_TIMEOUT 5.00 // motor power timeout in seconds
#define M1_MOTOR_MAP AXIS_X_EXTERNAL // 1ma
#define M1_STEP_ANGLE 1.8 // 1sa
@@ -102,7 +102,7 @@
#define M1_MICROSTEPS 8 // 1mi 1,2,4,8,16,32
#define M1_POLARITY 0 // 1po 0=normal, 1=reversed
#define M1_POWER_MODE MOTOR_POWER_MODE // 1pm 0=MOTOR_DISABLED, 1=MOTOR_ALWAYS_POWERED, 2=MOTOR_POWERED_IN_CYCLE, 3=MOTOR_POWERED_ONLY_WHEN_MOVING
#define M1_POWER_LEVEL 0.4
#define M1_POWER_LEVEL MOTOR_POWER_LEVEL // 1pl: 0.0=no power, 1.0=max power
#define M2_MOTOR_MAP AXIS_Y_EXTERNAL
#define M2_STEP_ANGLE 1.8
@@ -110,7 +110,7 @@
#define M2_MICROSTEPS 8
#define M2_POLARITY 0
#define M2_POWER_MODE MOTOR_POWER_MODE
#define M2_POWER_LEVEL 0.4
#define M2_POWER_LEVEL MOTOR_POWER_LEVEL
#define M3_MOTOR_MAP AXIS_Z_EXTERNAL // Imaginary Z axis. For testing
#define M3_STEP_ANGLE 1.8
@@ -118,7 +118,7 @@
#define M3_MICROSTEPS 8
#define M3_POLARITY 0
#define M3_POWER_MODE MOTOR_POWER_MODE
#define M3_POWER_LEVEL 0.4
#define M3_POWER_LEVEL MOTOR_POWER_LEVEL
#define M4_MOTOR_MAP AXIS_W_EXTERNAL // Imaginary W axis. For testing
#define M4_STEP_ANGLE 1.8
@@ -126,7 +126,7 @@
#define M4_MICROSTEPS 8
#define M4_POLARITY 1
#define M4_POWER_MODE MOTOR_POWER_MODE
#define M4_POWER_LEVEL 0.4
#define M4_POWER_LEVEL MOTOR_POWER_LEVEL
// *** axis settings **********************************************************************************