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
8f2891b6
Commit
8f2891b6
authored
Mar 17, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same fix
parent
1a251e0c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
23 deletions
+12
-23
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+0
-1
pins.h
MarlinKimbra/pins.h
+12
-20
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+0
-1
ultralcd.h
MarlinKimbra/ultralcd.h
+0
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
8f2891b6
...
@@ -6694,4 +6694,3 @@ void calculate_volumetric_multipliers() {
...
@@ -6694,4 +6694,3 @@ void calculate_volumetric_multipliers() {
for
(
int
i
=
0
;
i
<
EXTRUDERS
;
i
++
)
for
(
int
i
=
0
;
i
<
EXTRUDERS
;
i
++
)
volumetric_multiplier
[
i
]
=
calculate_volumetric_multiplier
(
filament_size
[
i
]);
volumetric_multiplier
[
i
]
=
calculate_volumetric_multiplier
(
filament_size
[
i
]);
}
}
MarlinKimbra/pins.h
View file @
8f2891b6
...
@@ -64,17 +64,18 @@
...
@@ -64,17 +64,18 @@
#include "boards.h"
#include "boards.h"
// Preset optional pins
// Preset optional pins
#define X_MS1_PIN -1
#define X_MS1_PIN
-1
#define X_MS2_PIN -1
#define X_MS2_PIN
-1
#define Y_MS1_PIN -1
#define Y_MS1_PIN
-1
#define Y_MS2_PIN -1
#define Y_MS2_PIN
-1
#define Z_MS1_PIN -1
#define Z_MS1_PIN
-1
#define Z_MS2_PIN -1
#define Z_MS2_PIN
-1
#define E0_MS1_PIN -1
#define E0_MS1_PIN
-1
#define E0_MS2_PIN -1
#define E0_MS2_PIN
-1
#define E1_MS1_PIN -1
#define E1_MS1_PIN
-1
#define E1_MS2_PIN -1
#define E1_MS2_PIN
-1
#define DIGIPOTSS_PIN -1
#define DIGIPOTSS_PIN -1
#define LCD_CONTRAST -1
/******************************************************************************
/******************************************************************************
...
@@ -946,7 +947,6 @@
...
@@ -946,7 +947,6 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
...
@@ -1146,7 +1146,6 @@
...
@@ -1146,7 +1146,6 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
...
@@ -1346,7 +1345,6 @@
...
@@ -1346,7 +1345,6 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
...
@@ -1546,7 +1544,6 @@
...
@@ -1546,7 +1544,6 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
...
@@ -2030,8 +2027,6 @@
...
@@ -2030,8 +2027,6 @@
#ifdef NEWPANEL
#ifdef NEWPANEL
//we have no buzzer installed
//we have no buzzer installed
#define BEEPER -1
#define BEEPER -1
//we can't regulate contrast by default
#define LCD_CONTRAST -1
//LCD Pins
//LCD Pins
#ifdef DOGLCD
#ifdef DOGLCD
#ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
...
@@ -2211,8 +2206,7 @@
...
@@ -2211,8 +2206,7 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
#define BTN_ENC 35
#define BTN_ENC 35
...
@@ -2416,7 +2410,6 @@
...
@@ -2416,7 +2410,6 @@
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BEEPER 37
#define LCD_CONTRAST -1
#define BTN_EN1 31
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_EN2 33
...
@@ -4526,4 +4519,3 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
...
@@ -4526,4 +4519,3 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
#define HAS_DIGIPOTSS (DIGIPOTSS_PIN >= 0)
#define HAS_DIGIPOTSS (DIGIPOTSS_PIN >= 0)
#endif //__PINS_H
#endif //__PINS_H
MarlinKimbra/ultralcd.cpp
View file @
8f2891b6
...
@@ -2013,4 +2013,3 @@ void copy_and_scalePID_d()
...
@@ -2013,4 +2013,3 @@ void copy_and_scalePID_d()
}
}
#endif //ULTRA_LCD
#endif //ULTRA_LCD
MarlinKimbra/ultralcd.h
View file @
8f2891b6
...
@@ -139,4 +139,3 @@ char *ftostr51(const float &x);
...
@@ -139,4 +139,3 @@ char *ftostr51(const float &x);
char
*
ftostr52
(
const
float
&
x
);
char
*
ftostr52
(
const
float
&
x
);
#endif //ULTRALCD_H
#endif //ULTRALCD_H
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