diff --git a/mlx90640/mlx90640_lcd_display.c b/mlx90640/mlx90640_lcd_display.c index 4b5be32..da3609f 100644 --- a/mlx90640/mlx90640_lcd_display.c +++ b/mlx90640/mlx90640_lcd_display.c @@ -213,15 +213,15 @@ averageTemp = 0.0; #endif BSP_LCD_FillRect(0,40, ST7789V_LCD_PIXEL_WIDTH, ST7789V_LCD_PIXEL_HEIGHT, LCD_COLOR_BLACK); - - for (y=0; y<23; y++) + // ignore edge of FOV + for (y=2; y<22; y++) { - for (x=1; x<32; x++) + for (x=2; x<30; x++) { if (zoneMask[y*32+x] > 3) { //APP_LOG(TS_OFF,VLEVEL_L,"\r\n X=%d Y=%d Count=%d\r\n",x,y,zoneMask[y*32+x]); - BSP_LCD_FillRect(x*8, y*11, 4, 4, LCD_COLOR_GREEN); + BSP_LCD_FillRect(x*8, y*11 + 32, 4, 4, LCD_COLOR_GREEN); } } } @@ -266,9 +266,10 @@ void blackOutFilter(void) if (maxTemp < normalPeopleTemp) { blackOutTag =0; - for (y=1; y<22; y++) + // ignore edge of FOV + for (y=2; y<22; y++) { - for (x=1; x<30; x++) + for (x=2; x<30; x++) { temp1 = (float)tempValues[(x) + (y*32)]; if ((temp1 + (float)(waterTempThreshold/10.0)) < averageTemp ) diff --git a/mlx90640/stm32_hx8347d_lcd.c b/mlx90640/stm32_hx8347d_lcd.c index fb4f458..d77e15e 100644 --- a/mlx90640/stm32_hx8347d_lcd.c +++ b/mlx90640/stm32_hx8347d_lcd.c @@ -1339,6 +1339,7 @@ void LCD_Delay(uint32_t Delay) */ void BSP_LCD_Test(void) { + char dspbuf1[]="SmarToilets", dspbuf2[]="Yunhorn Technology"; APP_LOG(TS_OFF,VLEVEL_L,"\r\n Clear with rainbow...........\r\n"); BSP_LCD_FillRect(0,0,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT/7,LCD_COLOR_RED); BSP_LCD_FillRect(0,1*ST7789V_LCD_PIXEL_HEIGHT/7,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT/7,LCD_COLOR_GREEN); @@ -1350,8 +1351,8 @@ void BSP_LCD_Test(void) BSP_LCD_FillRect(0,7*ST7789V_LCD_PIXEL_HEIGHT/7,ST7789V_LCD_PIXEL_WIDTH,ST7789V_LCD_PIXEL_HEIGHT/7,LCD_COLOR_BLACK); - BSP_LCD_DisplayStringAt(30, 3*ST7789V_LCD_PIXEL_HEIGHT/7, "SmarToilets", LEFT_MODE, LCD_COLOR_BLUE); - BSP_LCD_DisplayStringAt(10, 20+3*ST7789V_LCD_PIXEL_HEIGHT/7,"Yunhorn Technology", LEFT_MODE, LCD_COLOR_BLUE); + BSP_LCD_DisplayStringAt(30, 3*ST7789V_LCD_PIXEL_HEIGHT/7, (void *)dspbuf1, LEFT_MODE, LCD_COLOR_BLUE); + BSP_LCD_DisplayStringAt(10, 20+3*ST7789V_LCD_PIXEL_HEIGHT/7,(void *)dspbuf2, LEFT_MODE, LCD_COLOR_BLUE); HAL_Delay(2500); #if 0 @@ -1424,21 +1425,7 @@ void BSP_LCD_Test(void) //BSP_LCD_DrawBitmap(0, 0, (char *)gImage_1); HAL_Delay(500); #endif - /* - ST7789_Fill_Color(BLACK); - ST7789_DrawImage(0, 0, 240, 240, (uint16_t *)knky); - HAL_Delay(3000); - - ST7789_Fill_Color(BLACK); - ST7789_DrawImage(0, 0, 240, 240, (uint16_t *)tek); - HAL_Delay(3000); - - ST7789_Fill_Color(BLACK); - ST7789_DrawImage(0, 0, 240, 240, (uint16_t *)adi1); - HAL_Delay(3000); - - */ } //=========================================================2=============================================================//