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

Improved UART handling #5

Merged
merged 11 commits into from
Feb 20, 2020
Merged

Improved UART handling #5

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d40a86
Fix printing from an external device connected to one of the UART por…
hfog Feb 14, 2020
bf164af
Strip line numbers and checksums from gcode for parsing.
Feb 14, 2020
683665d
Revert "Strip line numbers and checksums from gcode for parsing."
hfog Feb 15, 2020
affaa5e
Change strategy for parsing gcode. It now forks into one section for …
hfog Feb 15, 2020
48b3a8b
Pass spontaneous messages (messages that aren't part of an explicit a…
hfog Feb 16, 2020
2fa9a7f
Minor tweaks to make sure we continue to pump message loops.
hfog Feb 16, 2020
c326dd0
Merge pull request #1 from guruathwal/master
hfog Feb 16, 2020
9827a69
Merge commit 'c326dd0fe8c9876053f3409c423790b7ea8f2ffc' into printfro…
hfog Feb 16, 2020
e6d800c
translate comments to english in popup.c & disable ST7920_FULLSCREEN …
guruathwal Feb 20, 2020
fce0043
move `CLEAN_MODE_SWITCHING_SUPPORT` to Marlin mode Setting area and a…
guruathwal Feb 20, 2020
031fb50
Update Configuration.h
guruathwal Feb 20, 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
2 changes: 1 addition & 1 deletion TFT/src/Libraries/cmsis/stm32f2xx/system_stm32f2xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static void SetSysClock(void)
RCC->CFGR |= RCC_CFGR_SW_PLL;

/* Wait till the main PLL is used as system clock source */
while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS ) != RCC_CFGR_SWS_PLL);
while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS ) != RCC_CFGR_SWS_PLL)
{
}
}
Expand Down
7 changes: 6 additions & 1 deletion TFT/src/User/API/LCD_Encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ void LCD_LoopEncoder(void)

void loopCheckMode(void)
{
if(isPrinting()) return;
// #ifndef CLEAN_MODE_SWITCHING_SUPPORT
// IDEALLY I would like to be able to swap even when the TFT is in printing mode
// but before I can allow that I need a way to make sure that we swap back into the right mode (and correct screen)
// and I really want a reliable way to DETECT that the TFT should be in printing mode even when the print was started externally.
if(isPrinting()) return;
// #endif
if(LCD_ReadBtn(LCD_CHANGE_MODE_INTERVALS) || LCD_ReadPen(LCD_CHANGE_MODE_INTERVALS))
{
infoMenu.menu[++infoMenu.cur] = menuMode;
Expand Down
3 changes: 3 additions & 0 deletions TFT/src/User/API/UI/ST7920_Simulator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ void menuST7920(void)
#if LCD_ENCODER_SUPPORT
loopCheckMode();
#endif
#ifdef CLEAN_MODE_SWITCHING_SUPPORT
loopBackEnd();
#endif
}
SPI_SlaveDeInit();
}
Expand Down
Loading