sundp
/
STS_RR_R125
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

reformat for minor warning

This commit is contained in:
Yunhorn 2023-12-12 10:55:14 +08:00
parent 6b03ad294c
commit 12b24da7f3
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-880720720590446918" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1256335571977009047" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-880720720590446918" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1256335571977009047" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

2
mlx90640/MLX90640_I2C_Driver.c
View File

@ -21,7 +21,7 @@ extern I2C_HandleTypeDef hi2c2;
void MLX90640_I2CInit()
{
MX_I2C_Init();
MX_I2C2_Init();
}

4
mlx90640/st7789.c
View File

@ -214,7 +214,7 @@ void st7789v_Init(void)
*/
void st7789v_DisplayOn(void)
{
uint8_t data = 0;
//uint8_t data = 0;
LCD_IO_WriteReg(0x13);/* Partial off (Normal): NORON */
LCD_Delay(10);
LCD_IO_WriteReg(0x29);/* Display on: DISPON */
@ -231,7 +231,7 @@ void st7789v_DisplayOn(void)
*/
void st7789v_DisplayOff(void)
{
uint8_t data = 0;
//uint8_t data = 0;
LCD_IO_WriteReg(0x13);/* Partial off (Normal): NORON */
LCD_Delay(10);
LCD_IO_WriteReg(0x28);/* Display off: DISPOFF */

20
mlx90640/stm32_hx8347d_lcd.c
View File

@ -1377,7 +1377,7 @@ void BSP_LCD_Test(void)
BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT,LCD_COLOR_BLUE);
#endif
#if 1
BSP_LCD_DisplayStringAt(10, 20, "Speed Test", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 20, (uint8_t*)"Speed Test", LEFT_MODE, LCD_COLOR_RED);
APP_LOG(TS_OFF,VLEVEL_L,"\r\n Speed Test...........");
BSP_LCD_Clear(LCD_COLOR_CYAN);
@ -1396,36 +1396,36 @@ void BSP_LCD_Test(void)
#endif
#if 1
APP_LOG(TS_OFF,VLEVEL_L,"\r\n Font and Hellow world Test...........");
BSP_LCD_DisplayStringAt(10, 10, "Font test.", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 50, "Hello World!", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 75, "Hello World!", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 100, "Hello World!", LEFT_MODE, LCD_COLOR_MAGENTA);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Font test.", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 50, (uint8_t*)"Hello World!", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 75, (uint8_t*)"Hello World!", LEFT_MODE, LCD_COLOR_RED);
BSP_LCD_DisplayStringAt(10, 100, (uint8_t*)"Hello World!", LEFT_MODE, LCD_COLOR_MAGENTA);
APP_LOG(TS_OFF,VLEVEL_L,"\r\n Rect, circle Triangle test...........");
BSP_LCD_Clear(LCD_COLOR_CYAN);
BSP_LCD_DisplayStringAt(10, 10, "Rect./Line.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Rect./Line.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DrawRect(40, 40, 200, 200, LCD_COLOR_CYAN);
BSP_LCD_Clear(LCD_COLOR_BLACK);
BSP_LCD_DisplayStringAt(10, 10, "Filled Rect.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Filled Rect.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_FillRect(40, 40, 160, 160, LCD_COLOR_CYAN);
BSP_LCD_Clear(LCD_COLOR_BLACK);
BSP_LCD_DisplayStringAt(10, 10, "Circle.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Circle.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DrawCircle(120, 120, 60, LCD_COLOR_CYAN);
BSP_LCD_Clear(LCD_COLOR_BLACK);
BSP_LCD_DisplayStringAt(10, 10, "Filled Cir.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Filled Cir.", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_FillCircle(120, 120, 60, LCD_COLOR_CYAN);
BSP_LCD_Clear(LCD_COLOR_BLACK);
BSP_LCD_DisplayStringAt(10, 10, "Filled Tri", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_DisplayStringAt(10, 10, (uint8_t*)"Filled Tri", LEFT_MODE, LCD_COLOR_YELLOW);
BSP_LCD_FillTriangle(30, 30, 30, 70, 60, 40, LCD_COLOR_CYAN);
BSP_LCD_Clear(LCD_COLOR_BLACK);