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
3653c5b0
Commit
3653c5b0
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same fix
parent
078e021e
master
dev
k40_flow_cooler
k40_noflow_nocooler
nextime
No related merge requests found
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
404 additions
and
735 deletions
+404
-735
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+3
-3
nextion_lcd.cpp
MarlinKimbra/nextion_lcd.cpp
+1
-1
nextion_lcd.h
MarlinKimbra/nextion_lcd.h
+1
-1
pins.h
MarlinKimbra/pins.h
+12
-5
qr_solve.cpp
MarlinKimbra/qr_solve.cpp
+369
-705
qr_solve.h
MarlinKimbra/qr_solve.h
+18
-20
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
3653c5b0
...
...
@@ -353,7 +353,7 @@ unsigned long printer_usage_seconds;
#endif // FWRETRACT
#if
ENABLED(ULTIPANEL
) && HAS(POWER_SWITCH)
#if
(ENABLED(ULTIPANEL) || ENABLED(NEXTION)
) && HAS(POWER_SWITCH)
bool
powersupply
=
#if ENABLED(PS_DEFAULT_OFF)
false
...
...
@@ -3692,13 +3692,13 @@ inline void gcode_G28() {
// raise extruder
float
measured_z
,
z_before
=
probePointCounter
?
Z_RAISE_BETWEEN_PROBINGS
+
current_position
[
Z_AXIS
]
:
Z_RAISE_BEFORE_PROBING
;
z_before
=
probePointCounter
?
Z_RAISE_BETWEEN_PROBINGS
+
current_position
[
Z_AXIS
]
:
Z_RAISE_BEFORE_PROBING
+
current_position
[
Z_AXIS
]
;
if
(
debugLevel
&
DEBUG_INFO
)
{
if
(
probePointCounter
)
ECHO_LMV
(
DB
,
"z_before = (between) "
,
(
float
)(
Z_RAISE_BETWEEN_PROBINGS
+
current_position
[
Z_AXIS
]));
else
ECHO_LMV
(
DB
,
"z_before = (before) "
,
(
float
)
Z_RAISE_BEFORE_PROBING
);
ECHO_LMV
(
DB
,
"z_before = (before) "
,
(
float
)
Z_RAISE_BEFORE_PROBING
+
current_position
[
Z_AXIS
]
);
}
ProbeAction
act
;
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/nextion_lcd.cpp
View file @
3653c5b0
...
...
@@ -21,7 +21,7 @@
bool
PageInfo
=
false
;
char
buffer
[
100
]
=
{
0
};
uint32_t
slidermaxval
=
20
;
char
lcd_status_message
[
30
]
=
WELCOME_MSG
;
// worst case is kana with up to 3*LCD_WIDTH+1
char
lcd_status_message
[
30
]
=
WELCOME_MSG
;
uint8_t
lcd_status_message_level
=
0
;
static
millis_t
next_lcd_update_ms
;
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/nextion_lcd.h
View file @
3653c5b0
...
...
@@ -4,7 +4,7 @@
#if ENABLED(NEXTION)
#define LCD_UPDATE_INTERVAL 5000
void
Exit
Up
PopCallback
(
void
*
ptr
);
void
ExitPopCallback
(
void
*
ptr
);
void
setpagePopCallback
(
void
*
ptr
);
void
hotPopCallback
(
void
*
ptr
);
void
sethotPopCallback
(
void
*
ptr
);
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/pins.h
View file @
3653c5b0
...
...
@@ -2297,19 +2297,26 @@
#define ORIG_E2_DIR_PIN 53
#define ORIG_E2_ENABLE_PIN 49
#define ORIG_E3_STEP_PIN 35
#define ORIG_E3_DIR_PIN 33
#define ORIG_E3_ENABLE_PIN 37
#define ORIG_E4_STEP_PIN 29
#define ORIG_E4_DIR_PIN 27
#define ORIG_E4_ENABLE_PIN 31
#define SDPOWER -1
#define SDSS 4
#define LED_PIN -1
#define BEEPER_PIN 41
#define ORIG_FAN_PIN -1
//#define CONTROLLERORIG_FAN_PIN 8 //Pin used for the fan to cool controller
#define ORIG_FAN_PIN 9
#define ORIG_FAN2_PIN 8
#define PS_ON_PIN 40
#define PS_ON_PIN
40
#define KILL_PIN -1
#define KILL_PIN
-1
#define ORIG_HEATER_BED_PIN 7 // BED
#define ORIG_HEATER_0_PIN 13
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/qr_solve.cpp
View file @
3653c5b0
This diff is collapsed.
Click to expand it.
MarlinKimbra/qr_solve.h
View file @
3653c5b0
#i
f ENABLED(AUTO_BED_LEVELING_GRID)
#i
nclude "base.h"
#ifndef QR_SOLVE_H
#define QR_SOLVE_H
#if ENABLED(AUTO_BED_LEVELING_GRID)
void
daxpy
(
int
n
,
double
da
,
double
dx
[],
int
incx
,
double
dy
[],
int
incy
);
double
ddot
(
int
n
,
double
dx
[],
int
incx
,
double
dy
[],
int
incy
);
double
dnrm2
(
int
n
,
double
x
[],
int
incx
);
void
dqrank
(
double
a
[],
int
lda
,
int
m
,
int
n
,
double
tol
,
int
*
kr
,
int
jpvt
[],
double
qraux
[]
);
void
dqrdc
(
double
a
[],
int
lda
,
int
n
,
int
p
,
double
qraux
[],
int
jpvt
[],
double
work
[],
int
job
);
int
dqrls
(
double
a
[],
int
lda
,
int
m
,
int
n
,
double
tol
,
int
*
kr
,
double
b
[],
double
x
[],
double
rsd
[],
int
jpvt
[],
double
qraux
[],
int
itask
);
void
dqrlss
(
double
a
[],
int
lda
,
int
m
,
int
n
,
int
kr
,
double
b
[],
double
x
[],
double
rsd
[],
int
jpvt
[],
double
qraux
[]
);
int
dqrsl
(
double
a
[],
int
lda
,
int
n
,
int
k
,
double
qraux
[],
double
y
[],
double
qy
[],
double
qty
[],
double
b
[],
double
rsd
[],
double
ab
[],
int
job
);
void
dscal
(
int
n
,
double
sa
,
double
x
[],
int
incx
);
void
dswap
(
int
n
,
double
x
[],
int
incx
,
double
y
[],
int
incy
);
void
qr_solve
(
double
x
[],
int
m
,
int
n
,
double
a
[],
double
b
[]
);
void
daxpy
(
int
n
,
double
da
,
double
dx
[],
int
incx
,
double
dy
[],
int
incy
);
double
ddot
(
int
n
,
double
dx
[],
int
incx
,
double
dy
[],
int
incy
);
double
dnrm2
(
int
n
,
double
x
[],
int
incx
);
void
dqrank
(
double
a
[],
int
lda
,
int
m
,
int
n
,
double
tol
,
int
*
kr
,
int
jpvt
[],
double
qraux
[]
);
void
dqrdc
(
double
a
[],
int
lda
,
int
n
,
int
p
,
double
qraux
[],
int
jpvt
[],
double
work
[],
int
job
);
int
dqrls
(
double
a
[],
int
lda
,
int
m
,
int
n
,
double
tol
,
int
*
kr
,
double
b
[],
double
x
[],
double
rsd
[],
int
jpvt
[],
double
qraux
[],
int
itask
);
void
dqrlss
(
double
a
[],
int
lda
,
int
m
,
int
n
,
int
kr
,
double
b
[],
double
x
[],
double
rsd
[],
int
jpvt
[],
double
qraux
[]
);
int
dqrsl
(
double
a
[],
int
lda
,
int
n
,
int
k
,
double
qraux
[],
double
y
[],
double
qy
[],
double
qty
[],
double
b
[],
double
rsd
[],
double
ab
[],
int
job
);
void
dscal
(
int
n
,
double
sa
,
double
x
[],
int
incx
);
void
dswap
(
int
n
,
double
x
[],
int
incx
,
double
y
[],
int
incy
);
void
qr_solve
(
double
x
[],
int
m
,
int
n
,
double
a
[],
double
b
[]
);
#endif
#endif
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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