3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'robert/MK3-variants' into variants

Browse source
This commit is contained in:
PavelSindler 2019-02-04 12:41:08 +01:00
commit b4f2dc3b5e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -49,3 +49,4 @@ Firmware/Doc
/lang/text.sym /lang/text.sym
/lang/textaddr.txt /lang/textaddr.txt
/build-env/ /build-env/
/Firmware/Firmware.vcxproj

4
Firmware/ultralcd.cpp
View file

@ -301,8 +301,8 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longF
j = 0; j = 0;
break; break;
}else{ }else{
if (j == 1) _delay(3); //wait around 1.2 s to start scrolling text if (j == 1) _delay_ms(3); //wait around 1.2 s to start scrolling text
_delay(1); //then scroll with redrawing every 300 ms _delay_ms(1); //then scroll with redrawing every 300 ms
} }
} }