Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
d411a5b7
Commit
d411a5b7
authored
Jun 02, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move laser pins to documentation config
parent
b62d3c41
Pipeline
#76
skipped
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
61 deletions
+20
-61
Configuration_Pins.h
...s_configs/K40_no_cooler_no_flowmeter/Configuration_Pins.h
+10
-6
Configuration_Pins.h
...onfigs/K40_with_cooler_and_flowmeter/Configuration_Pins.h
+10
-6
301.h
MK/module/boards/301.h
+0
-19
33.h
MK/module/boards/33.h
+0
-30
No files found.
Documentation/Laser/K40_ramps_configs/K40_no_cooler_no_flowmeter/Configuration_Pins.h
View file @
d411a5b7
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
#define HEATER_3_PIN ORIG_HEATER_3_PIN
#define HEATER_3_PIN ORIG_HEATER_3_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN
#define HEATER_CHAMBER_PIN -1
#define HEATER_CHAMBER_PIN -1
#define COOLER_PIN
-1
#define COOLER_PIN
2
// TEMP pin
// TEMP pin
#define TEMP_0_PIN ORIG_TEMP_0_PIN
#define TEMP_0_PIN ORIG_TEMP_0_PIN
...
@@ -108,11 +108,15 @@
...
@@ -108,11 +108,15 @@
#endif
#endif
#if ENABLED(LASERBEAM)
#if ENABLED(LASERBEAM)
#define LASER_PWR_PIN -1
#if LASER_CONTROL == 1
#define LASER_TTL_PIN -1
#define LASER_PWR_PIN 5
#define LASER_TTL_PIN -1
#elif LASER_CONTROL == 2
#define LASER_PWR_PIN 6
#define LASER_TTL_PIN 5
#if ENABLED(LASER_PERIPHERALS)
#if ENABLED(LASER_PERIPHERALS)
#define LASER_PERIPHERALS_PIN
-
1
#define LASER_PERIPHERALS_PIN
1
1
#define LASER_PERIPHERALS_STATUS_PIN
-1
#define LASER_PERIPHERALS_STATUS_PIN
14
#endif
#endif
#endif
#endif
...
@@ -125,7 +129,7 @@
...
@@ -125,7 +129,7 @@
#endif
#endif
#if ENABLED(FLOWMETER_SENSOR)
#if ENABLED(FLOWMETER_SENSOR)
#define FLOWMETER_PIN
-
1
#define FLOWMETER_PIN
2
1
#endif
#endif
#if ENABLED(POWER_CONSUMPTION)
#if ENABLED(POWER_CONSUMPTION)
...
...
Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Pins.h
View file @
d411a5b7
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
#define HEATER_3_PIN ORIG_HEATER_3_PIN
#define HEATER_3_PIN ORIG_HEATER_3_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN
#define HEATER_CHAMBER_PIN -1
#define HEATER_CHAMBER_PIN -1
#define COOLER_PIN
-1
#define COOLER_PIN
2
// TEMP pin
// TEMP pin
#define TEMP_0_PIN ORIG_TEMP_0_PIN
#define TEMP_0_PIN ORIG_TEMP_0_PIN
...
@@ -108,11 +108,15 @@
...
@@ -108,11 +108,15 @@
#endif
#endif
#if ENABLED(LASERBEAM)
#if ENABLED(LASERBEAM)
#define LASER_PWR_PIN -1
#if LASER_CONTROL == 1
#define LASER_TTL_PIN -1
#define LASER_PWR_PIN 5
#define LASER_TTL_PIN -1
#elif LASER_CONTROL == 2
#define LASER_PWR_PIN 6
#define LASER_TTL_PIN 5
#if ENABLED(LASER_PERIPHERALS)
#if ENABLED(LASER_PERIPHERALS)
#define LASER_PERIPHERALS_PIN
-
1
#define LASER_PERIPHERALS_PIN
1
1
#define LASER_PERIPHERALS_STATUS_PIN
-1
#define LASER_PERIPHERALS_STATUS_PIN
14
#endif
#endif
#endif
#endif
...
@@ -125,7 +129,7 @@
...
@@ -125,7 +129,7 @@
#endif
#endif
#if ENABLED(FLOWMETER_SENSOR)
#if ENABLED(FLOWMETER_SENSOR)
#define FLOWMETER_PIN
-
1
#define FLOWMETER_PIN
2
1
#endif
#endif
#if ENABLED(POWER_CONSUMPTION)
#if ENABLED(POWER_CONSUMPTION)
...
...
MK/module/boards/301.h
View file @
d411a5b7
...
@@ -74,25 +74,6 @@
...
@@ -74,25 +74,6 @@
#define KILL_PIN -1 // 80 with Smart Controller LCD
#define KILL_PIN -1 // 80 with Smart Controller LCD
#define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing.
#define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing.
#undef LASER_TTL_PIN
#undef LASER_PWR_PIN
#if LASER_CONTROL == 1
#define LASER_PWR_PIN 5
#define LASER_TTL_PIN -1
#endif
#if LASER_CONTROL == 2
#define LASER_TTL_PIN 5 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
#define LASER_PWR_PIN 2
#endif
#if ENABLED(LASER_PERIPHERALS)
#undef LASER_PERIPHERALS_PIN
#undef LASER_PERIPHERALS_STATUS_PIN
#define LASER_PERIPHERALS_PIN 11
#define LASER_PERIPHERALS_STATUS_PIN 4
#endif
#if ENABLED(ULTRA_LCD)
#if ENABLED(ULTRA_LCD)
#define KILL_PIN 80
#define KILL_PIN 80
...
...
MK/module/boards/33.h
View file @
d411a5b7
...
@@ -71,36 +71,6 @@
...
@@ -71,36 +71,6 @@
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#define ORIG_TEMP_BED_PIN 14 // ANALOG NUMBERING
#if ENABLED(LASERBEAM)
#undef LASER_TTL_PIN
#undef LASER_PWR_PIN
#if LASER_CONTROL == 1
#define LASER_PWR_PIN 5
#define LASER_TTL_PIN -1
#endif
#if LASER_CONTROL == 2
#define LASER_TTL_PIN 6 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
#define LASER_PWR_PIN 5
#endif
#endif
#if ENABLED(LASER_PERIPHERALS)
#undef LASER_PERIPHERALS_PIN
#undef LASER_PERIPHERALS_STATUS_PIN
#define LASER_PERIPHERALS_PIN 11
#define LASER_PERIPHERALS_STATUS_PIN 4
#endif
#if ENABLED(PIDTEMPCOOLER)
#undef COOLER_PIN
#define COOLER_PIN 2
#endif
#if ENABLED(FLOWMETER_SENSOR)
#undef FLOWMETER_PIN
#define FLOWMETER_PIN 21
#endif
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
#define KILL_PIN 41
#define KILL_PIN 41
#else
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment