Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build #2901

Open
wants to merge 2 commits into
base: MK3
Choose a base branch
from
Open

Fix build #2901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d796614
Fix warnings
espr14 Nov 24, 2020
fd7b42e
Fix scripts
espr14 Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Firmware/fsensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,11 @@ void fsensor_init(void)
}
}

#ifdef PAT9125
bool fsensor_enable(bool)
#else // PAT9125
bool fsensor_enable(bool bUpdateEEPROM)
#endif // PAT9125
{
#ifdef PAT9125
if (mmu_enabled == false) { //filament sensor is pat9125, enable only if it is working
Expand Down
6 changes: 3 additions & 3 deletions Firmware/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ bool bSettings; // flag (i.e. 'fake parameter'
const char STR_SEPARATOR[] PROGMEM = "------------";


static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename)
static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* filename, char* longFilename)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't touch this function, we know there is a problem and a correct solution is being prepared

{
char c;
int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP;
Expand Down Expand Up @@ -520,7 +520,7 @@ static uint8_t menu_item_sdfile(const char*
#ifdef NEW_SD_MENU
str
#endif //NEW_SD_MENU
,const char* str_fn, char* str_fnl)
, char* str_fn, char* str_fnl)
{
#ifdef NEW_SD_MENU
// printf_P(PSTR("menu sdfile\n"));
Expand Down Expand Up @@ -671,7 +671,7 @@ void lcdui_print_extruder(void)
// Print farm number (5 chars total)
void lcdui_print_farm(void)
{
int chars = lcd_printf_P(_N(" F0 "));
// int chars = lcd_printf_P(_N(" F0 "));
// lcd_space(5 - chars);
/*
// Farm number display
Expand Down
2 changes: 1 addition & 1 deletion lang/lang-add.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do
done

read -t 5
exit 0
exit 0
2 changes: 1 addition & 1 deletion lang/progmem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ cat $PROGMEM.var | sed 's/\r/\n/g' | sed -E 's/^[0-9a-f]{8} [^ ]* //' >$PROGMEM.

echo "progmem.sh finished" >&2

exit 0
exit 0
2 changes: 1 addition & 1 deletion lang/textaddr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ done > textaddr.txt

echo "textaddr.sh finished" >&2

exit 0
exit 0