Coldbox/TECware
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v5 - adding preassure sensor (lid status)

Browse Source
This commit is contained in:
pique_n
2024-05-02 09:58:56 +02:00
parent 213ee88c7a
commit 427106670b
6 changed files with 2647 additions and 4061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.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="-1631119689331759957" 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="1873311252418151697" 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="-1631119689331759957" 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="1873311252418151697" 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>

2
Core/Application/MAIN_MainApplication.c
View File

@ -57,7 +57,7 @@
//================================================================================================= //=================================================================================================
/* Software Version */ /* Software Version */
#define SW_VERSION 4 #define SW_VERSION 5
#define MSG_QUEUE_SIZE 8 #define MSG_QUEUE_SIZE 8

3
Core/Drivers/ADCD_AdcDriver.c
View File

@ -97,7 +97,6 @@
EVENT_DAC_START | EVENT_DAC_STOP | EVENT_ADC_DATA_READY | \ EVENT_DAC_START | EVENT_DAC_STOP | EVENT_ADC_DATA_READY | \
EVENT_RESET_DATA_COUNTER ) EVENT_RESET_DATA_COUNTER )
//================================================================================================= //=================================================================================================
// Section: MACROS // Section: MACROS
// Description: Definition of local macros (visible by this module only). // Description: Definition of local macros (visible by this module only).
@ -265,6 +264,8 @@ BOOL ADCD_boReadData( ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data )
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
*pu8Error &= ADCD_FAULT_MASK; // Mask the don't care bits
*pu8Error |= ADCD_STATUS_DATA_ERROR; *pu8Error |= ADCD_STATUS_DATA_ERROR;
return FALSE; return FALSE;

1
Core/Drivers/ADCD_AdcDriver.h
View File

@ -47,6 +47,7 @@ extern "C" {
#define ADCD_FAULT_REFINHIGH 0x10 #define ADCD_FAULT_REFINHIGH 0x10
#define ADCD_FAULT_RTDINLOW 0x08 #define ADCD_FAULT_RTDINLOW 0x08
#define ADCD_FAULT_OVUV 0x04 #define ADCD_FAULT_OVUV 0x04
#define ADCD_FAULT_MASK 0xFC
//================================================================================================= //=================================================================================================
// Section: MACROS // Section: MACROS

61
Core/Drivers/TEMP_Temperature.c
View File

@ -160,20 +160,40 @@ PRIVATE VOID vTask( PVOID arg )
{ {
flTempData[ADCD_eWater] = flConvertADCData( u16ADC_data ); flTempData[ADCD_eWater] = flConvertADCData( u16ADC_data );
} else { } else {
if( (u8error & ADCD_STATUS_DATA_ERROR) == ADCD_STATUS_DATA_ERROR ){ if( (u8error & ADCD_STATUS_DATA_ERROR) == ADCD_STATUS_DATA_ERROR ){
/** @todo call error handler temp data */ if( (u8error & ADCD_FAULT_HIGHTHRESH) == ADCD_FAULT_HIGHTHRESH ){
} else if( (u8error & ADCD_SPI_FAILURE) == ADCD_SPI_FAILURE ){ flTempData[ADCD_eWater] = 4200.0f;
}else if( (u8error & ADCD_FAULT_LOWTHRESH) == ADCD_FAULT_LOWTHRESH ){
flTempData[ADCD_eWater] = -273.16f;
}else if( (u8error & ADCD_FAULT_REFINLOW) == ADCD_FAULT_REFINLOW ){
flTempData[ADCD_eWater] = -273.16f;
}else if( (u8error & ADCD_FAULT_REFINHIGH) == ADCD_FAULT_REFINHIGH ){
flTempData[ADCD_eWater] = -273.16f;
}else if( (u8error & ADCD_FAULT_RTDINLOW) == ADCD_FAULT_RTDINLOW ){
flTempData[ADCD_eWater] = -273.16f;
}else if( (u8error & ADCD_FAULT_OVUV) == ADCD_FAULT_OVUV ){
flTempData[ADCD_eWater] = -273.16f;
} else {
flTempData[ADCD_eWater] = -273.16f;
}
/** @todo call error handler onchip spi failure */ /** @todo call error handler temp data */
} else if( (u8error & ADCD_SPI_FAILURE) == ADCD_SPI_FAILURE ){
flTempData[ADCD_eWater] = -273.16f;
/** @todo call error handler onchip spi failure */
} else {
flTempData[ADCD_eWater] = -273.16f;
}
u8error = 0;
boOK = TRUE;
} }
flTempData[ADCD_eWater] = -273.16f;
u8error = 0;
boOK = TRUE;
}
boOK &= ADCD_boReadData( ADCD_eModule, &u8error, &u16ADC_data ); boOK &= ADCD_boReadData( ADCD_eModule, &u8error, &u16ADC_data );
@ -183,16 +203,35 @@ PRIVATE VOID vTask( PVOID arg )
flTempData[ADCD_eModule] = flConvertADCData( u16ADC_data ); flTempData[ADCD_eModule] = flConvertADCData( u16ADC_data );
} else { } else {
if( (u8error & ADCD_STATUS_DATA_ERROR) == ADCD_STATUS_DATA_ERROR ){ if( (u8error & ADCD_STATUS_DATA_ERROR) == ADCD_STATUS_DATA_ERROR ){
if( (u8error & ADCD_FAULT_HIGHTHRESH) == ADCD_FAULT_HIGHTHRESH ){
flTempData[ADCD_eModule] = 4200.0f;
}else if( (u8error & ADCD_FAULT_LOWTHRESH) == ADCD_FAULT_LOWTHRESH ){
flTempData[ADCD_eModule] = -273.16f;
}else if( (u8error & ADCD_FAULT_REFINLOW) == ADCD_FAULT_REFINLOW ){
flTempData[ADCD_eModule] = -273.16f;
}else if( (u8error & ADCD_FAULT_REFINHIGH) == ADCD_FAULT_REFINHIGH ){
flTempData[ADCD_eModule] = -273.16f;
}else if( (u8error & ADCD_FAULT_RTDINLOW) == ADCD_FAULT_RTDINLOW ){
flTempData[ADCD_eModule] = -273.16f;
}else if( (u8error & ADCD_FAULT_OVUV) == ADCD_FAULT_OVUV ){
flTempData[ADCD_eModule] = -273.16f;
} else {
flTempData[ADCD_eModule] = -273.16f;
}
/** @todo call error handler temp data */ /** @todo call error handler temp data */
} else if( (u8error & ADCD_SPI_FAILURE) == ADCD_SPI_FAILURE ){ } else if( (u8error & ADCD_SPI_FAILURE) == ADCD_SPI_FAILURE ){
flTempData[ADCD_eModule] = -273.16f;
/** @todo call error handler onchip spi failure */ /** @todo call error handler onchip spi failure */
} else {
flTempData[ADCD_eModule] = -273.16f;
} }
flTempData[ADCD_eModule] = -273.16f;
u8error = 0; u8error = 0;
boOK = TRUE; boOK = TRUE;

6637
tecware.srec
View File

File diff suppressed because it is too large Load Diff