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

Split up pins.h to make pins more manageable #1416

Merged
merged 26 commits into from
Jan 28, 2015
Merged

Split up pins.h to make pins more manageable #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
86f1d1c
Split up pins to make it more manageable
thinkyhead Jan 26, 2015
b684f7e
Cleanup heading
thinkyhead Jan 26, 2015
5347ac2
cleanup
thinkyhead Jan 26, 2015
b51a583
cleanup
thinkyhead Jan 26, 2015
e5a7f34
Add support for 4th extruder
thinkyhead Jan 26, 2015
b87ec5d
Max endstop pins disabled by configuration
thinkyhead Jan 26, 2015
89282eb
Split up pins to make it more manageable
thinkyhead Jan 26, 2015
aa23e75
Cleanup heading
thinkyhead Jan 26, 2015
a0a97c9
cleanup
thinkyhead Jan 26, 2015
812fafa
Max endstop pins disabled by configuration
thinkyhead Jan 26, 2015
74b40b0
Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin i…
thinkyhead Jan 26, 2015
acf4a12
tweak
thinkyhead Jan 26, 2015
a231764
tweak tweak
thinkyhead Jan 26, 2015
ab1ddcd
Merge pull request #1425 from clefranc/Development
thinkyhead Jan 27, 2015
b697bb2
Make sure _Ex_PINS is defined
thinkyhead Jan 27, 2015
574a5ab
Split up pins to make it more manageable
thinkyhead Jan 26, 2015
4e57313
Cleanup heading
thinkyhead Jan 26, 2015
b6ecbd8
cleanup
thinkyhead Jan 26, 2015
df4f3e7
cleanup
thinkyhead Jan 26, 2015
8045e4d
Add support for 4th extruder
thinkyhead Jan 26, 2015
82474fe
Max endstop pins disabled by configuration
thinkyhead Jan 26, 2015
ebe78cb
tweak
thinkyhead Jan 26, 2015
80be6f3
tweak tweak
thinkyhead Jan 26, 2015
ae4b348
Make sure _Ex_PINS is defined
thinkyhead Jan 27, 2015
eacd931
Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin i…
thinkyhead Jan 27, 2015
2ce4a10
Add support for Megatronics 3 a la #1426
thinkyhead Jan 27, 2015
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
2 changes: 1 addition & 1 deletion Marlin/Marlin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

// Arduino < 1.0.0 does not define this, so we need to do it ourselves
#ifndef analogInputToDigitalPin
# define analogInputToDigitalPin(p) ((p) + A0)
# define analogInputToDigitalPin(p) ((p) + 0xA0)
#endif

#ifdef AT90USB
Expand Down
3 changes: 2 additions & 1 deletion Marlin/boards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed)
#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan)
#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignment
#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments
#define BOARD_GEN6 5 // Gen6
#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe
#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2
Expand All @@ -41,6 +41,7 @@
#define BOARD_MEGATRONICS 70 // Megatronics
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0
#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0
#define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board
#define BOARD_RAMBO 301 // Rambo
Expand Down
Loading