josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2058 from leptun/MK3_fix_warnings 

Fix "LANG_MODE 0" warnings
This commit is contained in:
DRracer 2019-12-15 09:29:27 +01:00 committed by GitHub
parent 6ab3b20ce1 5fdaead663
commit d68d9c7fef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/language.c
View File

@ -17,10 +17,10 @@ uint8_t lang_selected = 0;
#if (LANG_MODE == 0) //primary language only #if (LANG_MODE == 0) //primary language only
uint8_t lang_select(uint8_t lang) { return 0; } uint8_t lang_select(__attribute__((unused)) uint8_t lang) { return 0; }
uint8_t lang_get_count() { return 1; } uint8_t lang_get_count() { return 1; }
uint16_t lang_get_code(uint8_t lang) { return LANG_CODE_EN; } uint16_t lang_get_code(__attribute__((unused)) uint8_t lang) { return LANG_CODE_EN; }
const char* lang_get_name_by_code(uint16_t code) { return _n("English"); } const char* lang_get_name_by_code(__attribute__((unused)) uint16_t code) { return _n("English"); }
void lang_reset(void) { } void lang_reset(void) { }
uint8_t lang_is_selected(void) { return 1; } uint8_t lang_is_selected(void) { return 1; }

4
Firmware/ultralcd.cpp
View File

@ -112,7 +112,9 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg,
/* Different menus */ /* Different menus */
static void lcd_status_screen(); static void lcd_status_screen();
#if (LANG_MODE != 0)
static void lcd_language_menu(); static void lcd_language_menu();
#endif
static void lcd_main_menu(); static void lcd_main_menu();
static void lcd_tune_menu(); static void lcd_tune_menu();
//static void lcd_move_menu(); //static void lcd_move_menu();
@ -4929,6 +4931,7 @@ void lcd_wizard() {
} }
} }
#if (LANG_MODE != 0)
void lcd_language() void lcd_language()
{ {
lcd_update_enable(true); lcd_update_enable(true);
@ -4948,6 +4951,7 @@ void lcd_language()
else else
lang_select(LANG_ID_PRI); lang_select(LANG_ID_PRI);
} }
#endif
static void wait_preheat() static void wait_preheat()
{ {

3
Firmware/ultralcd.h
View File

@ -6,6 +6,7 @@
#include "conv2str.h" #include "conv2str.h"
#include "menu.h" #include "menu.h"
#include "mesh_bed_calibration.h" #include "mesh_bed_calibration.h"
#include "config.h"
#include "config.h" #include "config.h"
@ -220,7 +221,9 @@ void lcd_set_degree();
void lcd_set_progress(); void lcd_set_progress();
#endif #endif
#if (LANG_MODE != 0)
void lcd_language(); void lcd_language();
#endif
void lcd_wizard(); void lcd_wizard();
bool lcd_autoDepleteEnabled(); bool lcd_autoDepleteEnabled();