DMA2D configuration error fix (-DDEBUG_WINDOWS) (#190)
* Fixes DMA2D ConfError * Check configuration and transfer errors Check for DMA2D configuration and transfer errors and do not enter the otherwise endless while loop. Thx to @raphaelcoeffic for the tip.
This commit is contained in:
@@ -31,7 +31,7 @@ class FabButton: public Button {
|
|||||||
#if defined(DEBUG_WINDOWS)
|
#if defined(DEBUG_WINDOWS)
|
||||||
std::string getName() const override
|
std::string getName() const override
|
||||||
{
|
{
|
||||||
return "FabButton(" + std::to_string(icon) + ")";
|
return "FabButton";
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -369,6 +369,10 @@ void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, ui
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
@@ -409,6 +413,10 @@ void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x,
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
@@ -458,6 +466,10 @@ void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
@@ -512,6 +524,10 @@ void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
@@ -545,6 +561,10 @@ void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
@@ -578,6 +598,10 @@ void lcdCopy(void * dest, void * src)
|
|||||||
/* Start Transfer */
|
/* Start Transfer */
|
||||||
DMA2D_StartTransfer();
|
DMA2D_StartTransfer();
|
||||||
|
|
||||||
|
/* Check configuration error */
|
||||||
|
if ((DMA2D_GetFlagStatus(DMA2D_FLAG_CE) == SET) || (DMA2D_GetFlagStatus(DMA2D_FLAG_TE) == SET))
|
||||||
|
return; // Exit if configuration or transfer error
|
||||||
|
|
||||||
/* Wait for CTC Flag activation */
|
/* Wait for CTC Flag activation */
|
||||||
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
while (DMA2D_GetFlagStatus(DMA2D_FLAG_TC) == RESET);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user