Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-07 12:17:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added EXTERNAL axes to fix initializations

Browse Source
This commit is contained in:
Alden Hart
2017-05-06 06:48:19 -04:00
parent 39171e8fff
commit cc2a31e10c
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
g2core/g2core.cppproj
View File

@@ -73,7 +73,7 @@
<InterfaceName>SWD</InterfaceName>
</ToolOptions>
<ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
<ToolNumber>J41800019454</ToolNumber>
<ToolNumber>J41800036434</ToolNumber>
<ToolName>Atmel-ICE</ToolName>
</com_atmel_avrdbg_tool_atmelice>
<UseGdb>True</UseGdb>
@@ -100,7 +100,7 @@
<HWProgramCounterSampling>True</HWProgramCounterSampling>
</PercepioTrace>
<preserveEEPROM>true</preserveEEPROM>
<avrtoolserialnumber>J41800019454</avrtoolserialnumber>
<avrtoolserialnumber>J41800036434</avrtoolserialnumber>
<avrdeviceexpectedsignature>0x284E0A60</avrdeviceexpectedsignature>
<avrtoolinterfaceclock>10000000</avrtoolinterfaceclock>
<custom>

12
g2core/g2core.h
View File

@@ -72,6 +72,18 @@ typedef enum {
AXIS_C
} cmAxes;
typedef enum { // external representation of axes (used in initialization)
AXIS_X_EXTERNAL = 0,
AXIS_Y_EXTERNAL,
AXIS_Z_EXTERNAL,
AXIS_A_EXTERNAL,
AXIS_B_EXTERNAL,
AXIS_C_EXTERNAL,
AXIS_U_EXTERNAL,
AXIS_V_EXTERNAL,
AXIS_W_EXTERNAL
} cmAxesExternal;
typedef enum {
OFS_I = 0,
OFS_J,

12
g2core/settings/settings_default.h
View File

@@ -222,7 +222,7 @@
// MOTOR 1
#ifndef M1_MOTOR_MAP
#define M1_MOTOR_MAP AXIS_X // {1ma: AXIS_X, AXIS_Y...
#define M1_MOTOR_MAP AXIS_X_EXTERNAL // {1ma: AXIS_X, AXIS_Y...
#endif
#ifndef M1_STEP_ANGLE
#define M1_STEP_ANGLE 1.8 // {1sa: degrees per step
@@ -248,7 +248,7 @@
// MOTOR 2
#ifndef M2_MOTOR_MAP
#define M2_MOTOR_MAP AXIS_Y
#define M2_MOTOR_MAP AXIS_Y_EXTERNAL
#endif
#ifndef M2_STEP_ANGLE
#define M2_STEP_ANGLE 1.8
@@ -274,7 +274,7 @@
// MOTOR 3
#ifndef M3_MOTOR_MAP
#define M3_MOTOR_MAP AXIS_Z
#define M3_MOTOR_MAP AXIS_Z_EXTERNAL
#endif
#ifndef M3_STEP_ANGLE
#define M3_STEP_ANGLE 1.8
@@ -300,7 +300,7 @@
// MOTOR 4
#ifndef M4_MOTOR_MAP
#define M4_MOTOR_MAP AXIS_A
#define M4_MOTOR_MAP AXIS_A_EXTERNAL
#endif
#ifndef M4_STEP_ANGLE
#define M4_STEP_ANGLE 1.8
@@ -326,7 +326,7 @@
// MOTOR 5
#ifndef M5_MOTOR_MAP
#define M5_MOTOR_MAP AXIS_B
#define M5_MOTOR_MAP AXIS_B_EXTERNAL
#endif
#ifndef M5_STEP_ANGLE
#define M5_STEP_ANGLE 1.8
@@ -352,7 +352,7 @@
// MOTOR 6
#ifndef M6_MOTOR_MAP
#define M6_MOTOR_MAP AXIS_C
#define M6_MOTOR_MAP AXIS_C_EXTERNAL
#endif
#ifndef M6_STEP_ANGLE
#define M6_STEP_ANGLE 1.8

10
g2core/settings/settings_makeblock.h
View File

@@ -92,9 +92,9 @@
// 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 10.00 // motor power timeout in seconds
#define M1_MOTOR_MAP AXIS_X // 1ma
#define M1_MOTOR_MAP AXIS_X_EXTERNAL // 1ma
#define M1_STEP_ANGLE 1.8 // 1sa
#define M1_TRAVEL_PER_REV 36.576 // 1tr 2.032mm pitch * 18 teeth per revolution
#define M1_MICROSTEPS 8 // 1mi 1,2,4,8,16,32
@@ -102,7 +102,7 @@
#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 M2_MOTOR_MAP AXIS_Y
#define M2_MOTOR_MAP AXIS_Y_EXTERNAL
#define M2_STEP_ANGLE 1.8
#define M2_TRAVEL_PER_REV 36.576
#define M2_MICROSTEPS 8
@@ -110,7 +110,7 @@
#define M2_POWER_MODE MOTOR_POWER_MODE
#define M2_POWER_LEVEL 0.4
#define M3_MOTOR_MAP AXIS_Z // Imaginary Z axis. For testing
#define M3_MOTOR_MAP AXIS_Z_EXTERNAL // Imaginary Z axis. For testing
#define M3_STEP_ANGLE 1.8
#define M3_TRAVEL_PER_REV 1.25
#define M3_MICROSTEPS 8
@@ -118,7 +118,7 @@
#define M3_POWER_MODE MOTOR_POWER_MODE
#define M3_POWER_LEVEL 0.4
#define M4_MOTOR_MAP AXIS_A
#define M4_MOTOR_MAP AXIS_A_EXTERNAL
#define M4_STEP_ANGLE 1.8
#define M4_TRAVEL_PER_REV 1.25
#define M4_MICROSTEPS 8