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
9d0d0eb0
Commit
9d0d0eb0
authored
Jan 12, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
636c8542
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
3 deletions
+19
-3
Pins.h
MarlinKimbra/Pins.h
+17
-1
ultralcd.cpp
MarlinKimbra/module/ultralcd.cpp
+2
-2
No files found.
MarlinKimbra/Pins.h
View file @
9d0d0eb0
...
@@ -2348,6 +2348,22 @@
...
@@ -2348,6 +2348,22 @@
#define SDSS 10
#define SDSS 10
#define SDCARDDETECT 14
#define SDCARDDETECT 14
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCD_PINS_RS 46
#define LCD_PINS_ENABLE 47
#define LCD_PINS_D4 44
#define BEEPER_PIN 41
#define BTN_EN1 50
#define BTN_EN2 52
#define BTN_ENC 48
#if UI_VOLTAGE_LEVEL != 1
#undef UI_VOLTAGE_LEVEL
#define UI_VOLTAGE_LEVEL 1
#endif
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
#define BTN_EN1 50
#define BTN_EN1 50
#define BTN_EN2 52
#define BTN_EN2 52
...
...
MarlinKimbra/module/ultralcd.cpp
View file @
9d0d0eb0
#include "../base.h"
#include "../base.h"
#include "../Marlin_main.h"
#include "../Marlin_main.h"
#include "../
configuration_s
tore.h"
#include "../
Configuration_S
tore.h"
#if ENABLED(ULTRA_LCD)
#if ENABLED(ULTRA_LCD)
...
@@ -2452,7 +2452,7 @@ char* ftostr52(const float& x) {
...
@@ -2452,7 +2452,7 @@ char* ftostr52(const float& x) {
return
conv
;
return
conv
;
}
}
#if
DISABLED
(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
#if
!MECH
(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
static
void
lcd_level_bed
()
{
static
void
lcd_level_bed
()
{
...
...
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