Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config fixes for gShield/gquintic #476

Open
wants to merge 2 commits into
base: edge-preview
Choose a base branch
from
Open

Config fixes for gShield/gquintic #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb044d
Update gquintic hints to point at a rev that works.
thatch Jul 24, 2020
5ef84af
Due/gShield: Fix missing defaults for SPINDLE_*
thatch Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions g2core/board/gquintic.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@


# To compile:
# make BOARD=gquintic-a
# make BOARD=gquintic-d

# You can also choose a CONFIG from boards.mk:
# make CONFIG=PrintrbotPlus BOARD=gquintic-b
# make CONFIG=PrintrbotPlus BOARD=gquintic-d


##########
Expand All @@ -25,16 +25,16 @@ ifeq ("$(BOARD)","gquintic-c")
endif

ifeq ("$(BOARD)","gquintic-d")
BASE_BOARD=gquintic
DEVICE_DEFINES += MOTATE_BOARD="gquintic-d"
DEVICE_DEFINES += SETTINGS_FILE=${SETTINGS_FILE}
BASE_BOARD=gquintic
DEVICE_DEFINES += MOTATE_BOARD="gquintic-d"
DEVICE_DEFINES += SETTINGS_FILE=${SETTINGS_FILE}
endif

ifeq ("$(BOARD)","gquintic-g")
BASE_BOARD=gquintic
QUINTIC_N20=1
DEVICE_DEFINES += MOTATE_BOARD="gquintic-d"
DEVICE_DEFINES += SETTINGS_FILE=${SETTINGS_FILE}
BASE_BOARD=gquintic
QUINTIC_N20=1
DEVICE_DEFINES += MOTATE_BOARD="gquintic-d"
DEVICE_DEFINES += SETTINGS_FILE=${SETTINGS_FILE}
endif

##########
Expand Down
8 changes: 6 additions & 2 deletions g2core/settings/settings_default.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
#endif

#ifndef SPINDLE_ENABLE_POLARITY
#define SPINDLE_ENABLE_POLARITY SPINDLE_ACTIVE_HIGH // {spep: 0=active low, 1=active high
#define SPINDLE_ENABLE_POLARITY 1 // {spep: 0=active low, 1=active high
#endif

#ifndef SPINDLE_DIR_POLARITY
Expand Down Expand Up @@ -118,6 +118,10 @@
#define SPINDLE_SPEED_MAX 1000000.0 // {spsm:
#endif

#ifndef SPINDLE_SPEED_CHANGE_PER_MS
#define SPINDLE_SPEED_CHANGE_PER_MS 10.0 // TODO
#endif

#ifndef COOLANT_MIST_POLARITY
#define COOLANT_MIST_POLARITY 1 // {comp: 0=active low, 1=active high
#endif
Expand Down Expand Up @@ -259,7 +263,7 @@
#define M1_ENABLE_POLARITY IO_ACTIVE_LOW // {1ep: IO_ACTIVE_LOW or IO_ACTIVE_HIGH
#endif
#ifndef M1_STEP_POLARITY
#define M1_STEP_POLARITY IO_ACTIVE_HIGH // {1ps: IO_ACTIVE_LOW or IO_ACTIVE_HIGH
#define M1_STEP_POLARITY IO_ACTIVE_HIGH // {1sp: IO_ACTIVE_LOW or IO_ACTIVE_HIGH
#endif
#ifndef M1_POWER_MODE
#define M1_POWER_MODE MOTOR_DISABLED // {1pm: MOTOR_DISABLED, MOTOR_ALWAYS_POWERED, MOTOR_POWERED_IN_CYCLE, MOTOR_POWERED_ONLY_WHEN_MOVING
Expand Down