Update little changes
This commit is contained in:
parent
19ff672938
commit
eb358be3f7
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
@ -7,7 +7,10 @@
|
||||
},
|
||||
"cortex-debug.armToolchainPath": "c:\\Users\\pique_n\\AppData\\Roaming\\Code\\User\\globalStorage\\bmd.stm32-for-vscode\\@xpack-dev-tools\\arm-none-eabi-gcc\\10.3.1-2.3.1\\.content\\bin",
|
||||
"cortex-debug.openocdPath": "C:\\USERS\\PIQUE_N\\APPDATA\\ROAMING\\CODE\\USER\\GLOBALSTORAGE\\BMD.STM32-FOR-VSCODE\\@XPACK-DEV-TOOLS\\OPENOCD\\0.11.0-2.1\\.CONTENT\\BIN\\OPENOCD.EXE",
|
||||
"cortex-debug.variableUseNaturalFormat": true
|
||||
"cortex-debug.variableUseNaturalFormat": true,
|
||||
"stm32-for-vscode.openOCDPath": false,
|
||||
"stm32-for-vscode.makePath": false,
|
||||
"stm32-for-vscode.armToolchainPath": false
|
||||
|
||||
|
||||
}
|
@ -67,6 +67,8 @@
|
||||
#define COMMAND_ON 1
|
||||
#define COMMAND_OFF 2
|
||||
#define COMMAND_WATCHDOG 3
|
||||
#define COMMAND_ALARM 4
|
||||
#define COMMAND_CLEAR_ERROR 5
|
||||
|
||||
#define WATCHDOG 33000
|
||||
|
||||
@ -271,6 +273,9 @@ PRIVATE VOID vTask( PVOID arg )
|
||||
case COMMAND_WATCHDOG:
|
||||
osTimerStart( m_pstWatchdogTimer, WATCHDOG );
|
||||
break;
|
||||
case COMMAND_CLEAR_ERROR:
|
||||
VARH_vSetVariableDataFromSystemU32( VARH_eError, 0x00000000 );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -302,7 +302,7 @@ BOOL boSetPeltierVoltage( FLOAT Voltage ){
|
||||
if( Voltage > 12 ) Voltage = 12;
|
||||
if( Voltage < -3 ) Voltage = -3;
|
||||
|
||||
ANPO_boSetVoltage( ( ( (FLOAT)Voltage ) + 20.088) / 34.103 );
|
||||
boOK &= ANPO_boSetVoltage( ( ( (FLOAT)Voltage ) + 20.088) / 34.103 );
|
||||
|
||||
return( boOK );
|
||||
}
|
||||
|
@ -96,6 +96,7 @@ LOCAL CONST VARH_StVarInfo m_astVarInfo[VARH_eNumberOfVariables] =
|
||||
{ VARH_FLAGINFO_READONLY | VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)0.0f, (VARH_UVariable)150.0f }, // VARH_eSupply_P
|
||||
|
||||
{ VARH_FLAGINFO_READONLY, (VARH_UVariable)(U32)0, (VARH_UVariable)(U32)0, (VARH_UVariable)(U32)1 }, // VARH_ePowerState
|
||||
{ VARH_FLAGINFO_READONLY, (VARH_UVariable)(U32)0, (VARH_UVariable)(U32)0, (VARH_UVariable)(U32)0xFFFFFFFF }, // VARH_eError
|
||||
};
|
||||
|
||||
LOCAL CONST osMutexAttr_t m_stMutexAttr =
|
||||
|
@ -90,6 +90,7 @@ typedef enum
|
||||
VARH_eSupply_P,
|
||||
|
||||
VARH_ePowerState,
|
||||
VARH_eError,
|
||||
|
||||
VARH_eNumberOfVariables, // Must be last entry
|
||||
} VARH_EnVariables;
|
||||
|
Loading…
x
Reference in New Issue
Block a user