zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

misc. cleanup

Browse source
This commit is contained in:
Scott Lahteine 2021-03-03 00:11:50 -06:00
parent 369ffe518d
commit fd270ddc6c
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/STM32/tft/tft_spi.cpp
View file

@ -207,12 +207,12 @@ void TFT_SPI::Transmit(uint16_t Data) {
while ((SPIx.Instance->SR & SPI_FLAG_BSY) == SPI_FLAG_BSY) {} while ((SPIx.Instance->SR & SPI_FLAG_BSY) == SPI_FLAG_BSY) {}
if (TFT_MISO_PIN != TFT_MOSI_PIN) if (TFT_MISO_PIN != TFT_MOSI_PIN)
__HAL_SPI_CLEAR_OVRFLAG(&SPIx); /* Clear overrun flag in 2 Lines communication mode because received is not read */ __HAL_SPI_CLEAR_OVRFLAG(&SPIx); // Clear overrun flag in 2 Lines communication mode because received is not read
} }
void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) { void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
// Wait last dma finish, to start another // Wait last dma finish, to start another
while(isBusy()) { } while (isBusy()) { /* nada */ }
DMAtx.Init.MemInc = MemoryIncrease; DMAtx.Init.MemInc = MemoryIncrease;
HAL_DMA_Init(&DMAtx); HAL_DMA_Init(&DMAtx);
@ -225,7 +225,7 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
HAL_DMA_Start(&DMAtx, (uint32_t)Data, (uint32_t)&(SPIx.Instance->DR), Count); HAL_DMA_Start(&DMAtx, (uint32_t)Data, (uint32_t)&(SPIx.Instance->DR), Count);
__HAL_SPI_ENABLE(&SPIx); __HAL_SPI_ENABLE(&SPIx);
SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN); /* Enable Tx DMA Request */ SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN); // Enable Tx DMA Request
HAL_DMA_PollForTransfer(&DMAtx, HAL_DMA_FULL_TRANSFER, HAL_MAX_DELAY); HAL_DMA_PollForTransfer(&DMAtx, HAL_DMA_FULL_TRANSFER, HAL_MAX_DELAY);
Abort(); Abort();

4
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
View file

@ -310,7 +310,7 @@ namespace Anycubic {
bool ChironTFT::ReadTFTCommand() { bool ChironTFT::ReadTFTCommand() {
bool command_ready = false; bool command_ready = false;
while(TFTSer.available() > 0 && command_len < MAX_CMND_LEN) { while (TFTSer.available() > 0 && command_len < MAX_CMND_LEN) {
panel_command[command_len] = TFTSer.read(); panel_command[command_len] = TFTSer.read();
if (panel_command[command_len] == '\n') { if (panel_command[command_len] == '\n') {
command_ready = true; command_ready = true;
@ -338,7 +338,7 @@ namespace Anycubic {
int8_t ChironTFT::Findcmndpos(const char * buff, char q) { int8_t ChironTFT::Findcmndpos(const char * buff, char q) {
int8_t pos = 0; int8_t pos = 0;
do { if (buff[pos] == q) return pos; } while(++pos < MAX_CMND_LEN); do { if (buff[pos] == q) return pos; } while (++pos < MAX_CMND_LEN);
return -1; return -1;
} }

2
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
View file

@ -264,7 +264,7 @@ void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
void DGUSScreenHandler::SDPrintingFinished() { void DGUSScreenHandler::SDPrintingFinished() {
if (DGUSAutoTurnOff) { if (DGUSAutoTurnOff) {
while(!queue.ring_buffer.empty()) queue.advance(); while (!queue.ring_buffer.empty()) queue.advance();
gcode.process_subcommands_now_P(PSTR("M81")); gcode.process_subcommands_now_P(PSTR("M81"));
} }
GotoScreen(MKSLCD_SCREEN_PrintDone); GotoScreen(MKSLCD_SCREEN_PrintDone);

6
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
View file

@ -66,8 +66,10 @@ uint8_t sel_id = 0;
//root2.rewind(); //root2.rewind();
//SERIAL_ECHOLN(list_file.curDirPath); //SERIAL_ECHOLN(list_file.curDirPath);
if (curDirLever != 0) card.cd(list_file.curDirPath); if (curDirLever != 0)
else card.cdroot(); // while(card.cdup()); card.cd(list_file.curDirPath);
else
card.cdroot();
const uint16_t fileCnt = card.get_num_Files(); const uint16_t fileCnt = card.get_num_Files();

2
Marlin/src/lcd/menu/menu_ubl.cpp
View file

@ -476,7 +476,7 @@ void ubl_map_screen() {
if (position_is_reachable(xy)) break; // Found a valid point if (position_is_reachable(xy)) break; // Found a valid point
ui.encoderPosition += step_dir; // Test the next point ui.encoderPosition += step_dir; // Test the next point
#endif #endif
} while(ENABLED(IS_KINEMATIC)); } while (ENABLED(IS_KINEMATIC));
// Determine number of points to edit // Determine number of points to edit
#if IS_KINEMATIC #if IS_KINEMATIC