sundp
/
STS-TMG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes

This commit is contained in:
Yunhorn 2023-10-01 18:47:16 +08:00
parent f78fd6a2d5
commit 13a0801d91
2 changed files with 3 additions and 16 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 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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="-1466005334055797586" 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="1798498436024772945" 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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="-1466005334055797586" 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="1798498436024772945" 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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

13
mlx90640/mlx90640_lcd_display.c
View File

@ -39,11 +39,7 @@ int x, y, i, j;
// array for the 32 x 24 measured tempValues // array for the 32 x 24 measured tempValues
static float tempValues[32*24]; static float tempValues[32*24];
volatile uint8_t zoneMask[32*24]={0x0}, edgeMask[32*24]={0x0}; volatile uint8_t zoneMask[32*24]={0x0}, edgeMask[32*24]={0x0};
<<<<<<< HEAD
void mlx90640_setCalibrationWaterTemp(void); void mlx90640_setCalibrationWaterTemp(void);
=======
void setCalibrationWaterTemp(void);
>>>>>>> 5e99684106096ccf79c571db54b302efc6a01d1a
void blackOutFilter(void); void blackOutFilter(void);
static uint16_t TempToColor(float val); static uint16_t TempToColor(float val);
static void setTempScale(void); static void setTempScale(void);
@ -94,16 +90,10 @@ static uint16_t TempToColor(float val)
// use the displays color mapping function to get 5-6-5 color palette (R=5 bits, G=6 bits, B-5 bits) // use the displays color mapping function to get 5-6-5 color palette (R=5 bits, G=6 bits, B-5 bits)
return BSP_LCD_GetColor565(red, green, blue); return BSP_LCD_GetColor565(red, green, blue);
} }
<<<<<<< HEAD
void mlx90640_setCalibrationWaterTemp(void) void mlx90640_setCalibrationWaterTemp(void)
{ {
char tempbuf[128]=""; char tempbuf[128]="";
APP_LOG(TS_OFF,VLEVEL_L,"Start Calibration of Water, Put water in the center of FOV \r\n"); APP_LOG(TS_OFF,VLEVEL_L,"Start Calibration of Water, Put water in the center of FOV \r\n");
=======
void setCalibrationWaterTemp(void)
{
char tempbuf[128]="";
>>>>>>> 5e99684106096ccf79c571db54b302efc6a01d1a
readTempValues(); readTempValues();
setTempScale(); setTempScale();
calibrationWaterTemp = centerTemp; calibrationWaterTemp = centerTemp;
@ -370,11 +360,8 @@ void mlx90640_display_process(void)
LCD_BL_OFF(); LCD_BL_OFF();
// BSP_LCD_DisplayOff(); // BSP_LCD_DisplayOff();
} }
<<<<<<< HEAD
APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Spot Detected Count = %2d Level = %d of 600 \r\n", waterSpillSpotCount,waterSpillLevel); APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Spot Detected Count = %2d Level = %d of 600 \r\n", waterSpillSpotCount,waterSpillLevel);
=======
>>>>>>> 5e99684106096ccf79c571db54b302efc6a01d1a
if ((waterSpillSpotCount != lastWaterSpillSpotCount)&&(waterSpillSpotCount != 0)) { if ((waterSpillSpotCount != lastWaterSpillSpotCount)&&(waterSpillSpotCount != 0)) {
APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Spot Detected Count = %2d Level = %d of 600 \r\n", waterSpillSpotCount,waterSpillLevel); APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Spot Detected Count = %2d Level = %d of 600 \r\n", waterSpillSpotCount,waterSpillLevel);
lastWaterSpillSpotCount = waterSpillSpotCount; lastWaterSpillSpotCount = waterSpillSpotCount;