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

bugfix R_Petlier and bootloader init

Browse Source
This commit is contained in:
pique_n 2023-11-07 11:13:44 +01:00
parent 715cb5f478
commit 53a44a4075
7 changed files with 17 additions and 11 deletions
Show Stats 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="983228128624840901" 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="-1334530455183847715" 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="983228128624840901" 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="-1334530455183847715" 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>

6
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,6 @@
{
"C_Cpp.default.compilerPath": "C:\\MinGW\\bin\\gcc.exe",
"files.associations": {
"eeprom_emul.h": "c"
}
}

2
Core/Application/MAIN_MainApplication.c
View File

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

2
Core/Application/PECO_PeltierController.c
View File

@ -214,7 +214,7 @@ VOID vTask( PVOID arg )
FLOAT last_error = 0; FLOAT last_error = 0;
FLOAT integral = 0; FLOAT integral = 0;
FLOAT dT = REFRESH / 1000.0f; // 1s FLOAT dT = REFRESH / 1000.0f; // 0.1s
while ( TRUE ) while ( TRUE )
{ {

2
Core/Drivers/ANPI_AnalogPortsIn.c
View File

@ -241,7 +241,7 @@ VOID vTask( PVOID arg )
VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_U, aflValues[ANPI_eOutputVoltage] ); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_U, aflValues[ANPI_eOutputVoltage] );
VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_I, aflValues[ANPI_eOutputCurrent] ); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_I, aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_R, aflValues[ANPI_eOutputVoltage] / aflValues[ANPI_eOutputCurrent] ); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_R, aflValues[ANPI_eOutputVoltage] / aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_R, aflValues[ANPI_eOutputVoltage] * aflValues[ANPI_eOutputCurrent] ); VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_P, aflValues[ANPI_eOutputVoltage] * aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_U, aflValues[ANPI_eSupplyVoltage24V] ); VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_U, aflValues[ANPI_eSupplyVoltage24V] );
VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_I, aflValues[ANPI_eSupplyCurrent24V] ); VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_I, aflValues[ANPI_eSupplyCurrent24V] );

2
startup_stm32l432xx.s
View File

@ -230,7 +230,7 @@ g_pfnVectors:
.word RNG_IRQHandler .word RNG_IRQHandler
.word FPU_IRQHandler .word FPU_IRQHandler
.word CRS_IRQHandler .word CRS_IRQHandler
.word 0x55AA11EE .word 0xEEAA5522
/******************************************************************************* /*******************************************************************************

10
tecware.srec
View File

@ -1,4 +1,4 @@
S00B00007465632E73726563DD S00F0000746563776172652E737265632A
S31508002800000001208D220108055C00080B5C000809 S31508002800000001208D220108055C00080B5C000809
S31508002810115C0008175C00081D5C00080000000039 S31508002810115C0008175C00081D5C00080000000039
S31508002820000000000000000000000000E11A010896 S31508002820000000000000000000000000E11A010896
@ -23,7 +23,7 @@ S31508002940DD220108DD220108DD220108DD22010859
S31508002950DD220108DD220108DD220108DD22010849 S31508002950DD220108DD220108DD220108DD22010849
S31508002960DD220108DD220108DD2201080000000041 S31508002960DD220108DD220108DD2201080000000041
S31508002970DD220108DD220108000000000000000039 S31508002970DD220108DD220108000000000000000039
S31508002980DD220108DD220108DD220108EE11AA5523 S31508002980DD220108DD220108DD2201082255AAEE12
S3150800299010B5054C237833B9044B13B10448AFF38B S3150800299010B5054C237833B9044B13B10448AFF38B
S315080029A000800123237010BD4001002000000000B4 S315080029A000800123237010BD4001002000000000B4
S315080029B0DC24010808B5034B1BB103490348AFF3F0 S315080029B0DC24010808B5034B1BB103490348AFF3F0
@ -189,7 +189,7 @@ S315080033A01360344B1B68002B14BF01230023DBB2C8
S315080033B01A467B6813407B602F4B022201212F4857 S315080033B01A467B6813407B602F4B022201212F4857
S315080033C00AF0C8FE03462E4A13602D4B1B68002BD5 S315080033C00AF0C8FE03462E4A13602D4B1B68002BD5
S315080033D014BF01230023DBB21A467B6813407B60C7 S315080033D014BF01230023DBB21A467B6813407B60C7
S315080033E0284B0222012125480AF0B4FE0346264A44 S315080033E0284B0422012125480AF0B4FE0346264A42
S315080033F01360254B1B68002B14BF01230023DBB287 S315080033F01360254B1B68002B14BF01230023DBB287
S315080034001A467B6813407B601D4B1B684FF47A7124 S315080034001A467B6813407B601D4B1B684FF47A7124
S3150800341018460AF01BFF0346002B0CBF01230023A6 S3150800341018460AF01BFF0346002B0CBF01230023A6
@ -220,7 +220,7 @@ S31508003590F13500081B360008FF2B15D042E0012044
S315080035A000F0F0F83FE0002000F0ECF83BE0294B93 S315080035A000F0F0F83FE0002000F0ECF83BE0294B93
S315080035B01B6840F6B83118460AF048FE33E0002189 S315080035B01B6840F6B83118460AF048FE33E0002189
S315080035C0132000F0BBFA2EE0002000F0DBF804F030 S315080035C0132000F0BBFA2EE0002000F0DBF804F030
S315080035D066FF28E0062387F82030032387F8213082 S315080035D066FF28E0062387F82030042387F8213081
S315080035E0FA697B7E07F12000022101F05DF81AE0F6 S315080035E0FA697B7E07F12000022101F05DF81AE0F6
S315080035F0072387F8203000F02FFB0346002B01D065 S315080035F0072387F8203000F02FFB0346002B01D065
S31508003600FF2300E0002387F82130FA697B7E07F163 S31508003600FF2300E0002387F82130FA697B7E07F163
@ -449,7 +449,7 @@ S315080043E0D7ED057AB0EE670A0B20FFF7B7FBD7EDD6
S315080043F0067AB0EE670A0C20FFF7B0FB97ED057A50 S315080043F0067AB0EE670A0C20FFF7B0FB97ED057A50
S31508004400D7ED067AC7EE276AB0EE660A0D20FFF7E3 S31508004400D7ED067AC7EE276AB0EE660A0D20FFF7E3
S31508004410A5FB97ED057AD7ED067A67EE277AB0EE13 S31508004410A5FB97ED057AD7ED067A67EE277AB0EE13
S31508004420670A0D20FFF79AFBD7ED037AB0EE670A05 S31508004420670A0E20FFF79AFBD7ED037AB0EE670A04
S315080044300F20FFF793FBD7ED047AB0EE670A10203A S315080044300F20FFF793FBD7ED047AB0EE670A10203A
S31508004440FFF78CFB97ED037AD7ED047A67EE277AA8 S31508004440FFF78CFB97ED037AD7ED047A67EE277AA8
S31508004450B0EE670A1120FFF781FB074B1B68184669 S31508004450B0EE670A1120FFF781FB074B1B68184669