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
284598c1
Commit
284598c1
authored
Jan 06, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
f6cbc84d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
Marlin.h
MarlinKimbra/Marlin.h
+3
-3
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+3
-3
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+6
-1
No files found.
MarlinKimbra/Marlin.h
View file @
284598c1
...
...
@@ -276,9 +276,9 @@ extern unsigned char fanSpeedSoftPwm;
#endif
#ifdef FILAMENT_SENSOR
extern
float
filament_width_nominal
;
//holds the theoretical filament diameter ie., 3.00 or 1.75
extern
bool
filament_sensor
;
//indicates that filament sensor readings should control extrusion
extern
float
filament_width_meas
;
//holds the filament diameter as accurately measured
extern
float
filament_width_nominal
;
//holds the theoretical filament diameter ie., 3.00 or 1.75
extern
bool
filament_sensor
;
//indicates that filament sensor readings should control extrusion
extern
float
filament_width_meas
;
//holds the filament diameter as accurately measured
extern
signed
char
measurement_delay
[];
//ring buffer to delay measurement
extern
int
delay_index1
,
delay_index2
;
//index into ring buffer
extern
float
delay_dist
;
//delay distance counter
...
...
MarlinKimbra/Marlin_main.cpp
View file @
284598c1
...
...
@@ -31,9 +31,9 @@
#ifdef ENABLE_AUTO_BED_LEVELING
#include "vector_3.h"
#ifdef AUTO_BED_LEVELING_GRID
#include "qr_solve.h"
#endif
#ifdef AUTO_BED_LEVELING_GRID
#include "qr_solve.h"
#endif
#endif // ENABLE_AUTO_BED_LEVELING
#include "ultralcd.h"
...
...
MarlinKimbra/ultralcd.cpp
View file @
284598c1
...
...
@@ -1126,7 +1126,7 @@ static void lcd_control_volumetric_menu()
START_MENU
();
MENU_ITEM
(
back
,
MSG_CONTROL
,
lcd_control_menu
);
MENU_ITEM_EDIT
(
bool
,
MSG_VOLUMETRIC_ENABLED
,
&
volumetric_enabled
);
MENU_ITEM_EDIT
_CALLBACK
(
bool
,
MSG_VOLUMETRIC_ENABLED
,
&
volumetric_enabled
,
calculate_volumetric_multipliers
);
if
(
volumetric_enabled
)
{
MENU_ITEM_EDIT_CALLBACK
(
float43
,
MSG_FILAMENT_SIZE_EXTRUDER_0
,
&
filament_size
[
0
],
DEFAULT_NOMINAL_FILAMENT_DIA
-
.5
,
DEFAULT_NOMINAL_FILAMENT_DIA
+
.5
,
calculate_volumetric_multipliers
);
...
...
@@ -1361,6 +1361,11 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr)
{
*
ptr
=
!
(
*
ptr
);
}
static
void
menu_action_setting_edit_callback_bool
(
const
char
*
pstr
,
bool
*
ptr
,
menuFunc_t
callback
)
{
menu_action_setting_edit_bool
(
pstr
,
ptr
);
(
*
callback
)();
}
#endif//ULTIPANEL
/** LCD API **/
...
...
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