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
b642a8f9
Commit
b642a8f9
authored
Aug 20, 2015
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 4.1.5 dev
Added statistics menu in lcd
parent
2b3e1992
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
1 deletion
+31
-1
changelog.md
Documentation/changelog.md
+1
-0
language_en.h
MarlinKimbra/language_en.h
+3
-0
language_it.h
MarlinKimbra/language_it.h
+3
-0
sanitycheck.h
MarlinKimbra/sanitycheck.h
+4
-0
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+20
-1
No files found.
Documentation/changelog.md
View file @
b642a8f9
### Version 4.1.5
### Version 4.1.5
*
Added statistics menu
*
Added an overall configuration file
*
Added an overall configuration file
*
Added M70 gcode for calibrate AC721 current sensor
*
Added M70 gcode for calibrate AC721 current sensor
*
Added documentation for calibrate AC721 current sensor
*
Added documentation for calibrate AC721 current sensor
...
...
MarlinKimbra/language_en.h
View file @
b642a8f9
...
@@ -35,6 +35,8 @@
...
@@ -35,6 +35,8 @@
#define MSG_MBL_6 " BED leveled! "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Set origin"
#define MSG_SET_ORIGIN "Set origin"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT_PLA "Preheat PLA"
#define MSG_PREHEAT_PLA "Preheat PLA"
#define MSG_PREHEAT_PLA_ALL "Preheat PLA All"
#define MSG_PREHEAT_PLA_ALL "Preheat PLA All"
#define MSG_PREHEAT_PLA_BEDONLY "Preheat PLA Bed"
#define MSG_PREHEAT_PLA_BEDONLY "Preheat PLA Bed"
...
@@ -68,6 +70,7 @@
...
@@ -68,6 +70,7 @@
#define MSG_FAN_SPEED "Fan speed"
#define MSG_FAN_SPEED "Fan speed"
#define MSG_FLOW "Flow"
#define MSG_FLOW "Flow"
#define MSG_CONTROL "Control"
#define MSG_CONTROL "Control"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
...
...
MarlinKimbra/language_it.h
View file @
b642a8f9
...
@@ -31,6 +31,8 @@
...
@@ -31,6 +31,8 @@
#define MSG_MBL_6 " Piatto livellato! "
#define MSG_MBL_6 " Piatto livellato! "
#define MSG_SET_HOME_OFFSETS "Setta offset home"
#define MSG_SET_HOME_OFFSETS "Setta offset home"
#define MSG_SET_ORIGIN "Imposta Origine"
#define MSG_SET_ORIGIN "Imposta Origine"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.za:"
#define MSG_PREHEAT_PLA "Preriscalda PLA"
#define MSG_PREHEAT_PLA "Preriscalda PLA"
#define MSG_PREHEAT_PLA_ALL "Prer. PLA Tutto"
#define MSG_PREHEAT_PLA_ALL "Prer. PLA Tutto"
#define MSG_PREHEAT_PLA_BEDONLY "Prer. PLA Piatto"
#define MSG_PREHEAT_PLA_BEDONLY "Prer. PLA Piatto"
...
@@ -64,6 +66,7 @@
...
@@ -64,6 +66,7 @@
#define MSG_FAN_SPEED "Ventola"
#define MSG_FAN_SPEED "Ventola"
#define MSG_FLOW "Flusso"
#define MSG_FLOW "Flusso"
#define MSG_CONTROL "Controllo"
#define MSG_CONTROL "Controllo"
#define MSG_STATS "Statistiche"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
...
...
MarlinKimbra/sanitycheck.h
View file @
b642a8f9
...
@@ -279,6 +279,10 @@
...
@@ -279,6 +279,10 @@
#endif
#endif
#endif
#endif
#if DISABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
#error You have to enable SDSUPPORT to use SD_SETTINGS
#endif
/**
/**
* Warnings for old configurations
* Warnings for old configurations
*/
*/
...
...
MarlinKimbra/ultralcd.cpp
View file @
b642a8f9
...
@@ -67,6 +67,7 @@ static void lcd_status_screen();
...
@@ -67,6 +67,7 @@ static void lcd_status_screen();
static
void
lcd_prepare_temperature_menu
();
static
void
lcd_prepare_temperature_menu
();
static
void
lcd_move_menu
();
static
void
lcd_move_menu
();
static
void
lcd_control_menu
();
static
void
lcd_control_menu
();
static
void
lcd_stats_menu
();
static
void
lcd_control_temperature_menu
();
static
void
lcd_control_temperature_menu
();
static
void
lcd_control_temperature_preheat_pla_settings_menu
();
static
void
lcd_control_temperature_preheat_pla_settings_menu
();
static
void
lcd_control_temperature_preheat_abs_settings_menu
();
static
void
lcd_control_temperature_preheat_abs_settings_menu
();
...
@@ -449,6 +450,8 @@ static void lcd_main_menu() {
...
@@ -449,6 +450,8 @@ static void lcd_main_menu() {
}
}
MENU_ITEM
(
submenu
,
MSG_CONTROL
,
lcd_control_menu
);
MENU_ITEM
(
submenu
,
MSG_CONTROL
,
lcd_control_menu
);
MENU_ITEM
(
submenu
,
MSG_STATS
,
lcd_stats_menu
);
#if ENABLED(SDSUPPORT)
#if ENABLED(SDSUPPORT)
if
(
card
.
cardOK
)
{
if
(
card
.
cardOK
)
{
if
(
card
.
isFileOpen
())
{
if
(
card
.
isFileOpen
())
{
...
@@ -1045,6 +1048,22 @@ static void lcd_control_menu() {
...
@@ -1045,6 +1048,22 @@ static void lcd_control_menu() {
END_MENU
();
END_MENU
();
}
}
/**
*
* "Statistics" submenu
*
*/
static
void
lcd_stats_menu
()
{
char
row
[
30
];
int
day
=
printer_usage_seconds
/
60
/
60
/
24
,
hours
=
(
printer_usage_seconds
/
60
/
60
)
%
24
,
minutes
=
(
printer_usage_seconds
/
60
)
%
60
;
sprintf_P
(
row
,
PSTR
(
MSG_ONFOR
" %id %ih %im"
),
day
,
hours
,
minutes
);
LCD_Printpos
(
0
,
0
);
lcd_print
(
row
);
sprintf_P
(
row
,
PSTR
(
MSG_PWRCONSUMED
" %iWh"
),
power_consumption_hour
);
LCD_Printpos
(
0
,
1
);
lcd_print
(
row
);
if
(
LCD_CLICKED
)
lcd_goto_menu
(
lcd_main_menu
);
}
/**
/**
*
*
* "Temperature" submenu
* "Temperature" submenu
...
...
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