diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 803af8a..038480d 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..5150864
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+ "C_Cpp.default.compilerPath": "C:\\MinGW\\bin\\gcc.exe",
+ "files.associations": {
+ "eeprom_emul.h": "c"
+ }
+}
\ No newline at end of file
diff --git a/Core/Application/MAIN_MainApplication.c b/Core/Application/MAIN_MainApplication.c
index b06caff..92821b0 100644
--- a/Core/Application/MAIN_MainApplication.c
+++ b/Core/Application/MAIN_MainApplication.c
@@ -57,7 +57,7 @@
//=================================================================================================
/* Software Version */
-#define SW_VERSION 3
+#define SW_VERSION 4
#define MSG_QUEUE_SIZE 8
diff --git a/Core/Application/PECO_PeltierController.c b/Core/Application/PECO_PeltierController.c
index 35759b7..37e5570 100644
--- a/Core/Application/PECO_PeltierController.c
+++ b/Core/Application/PECO_PeltierController.c
@@ -214,7 +214,7 @@ VOID vTask( PVOID arg )
FLOAT last_error = 0;
FLOAT integral = 0;
- FLOAT dT = REFRESH / 1000.0f; // 1s
+ FLOAT dT = REFRESH / 1000.0f; // 0.1s
while ( TRUE )
{
diff --git a/Core/Drivers/ANPI_AnalogPortsIn.c b/Core/Drivers/ANPI_AnalogPortsIn.c
index 269050f..29509c9 100644
--- a/Core/Drivers/ANPI_AnalogPortsIn.c
+++ b/Core/Drivers/ANPI_AnalogPortsIn.c
@@ -241,7 +241,7 @@ VOID vTask( PVOID arg )
VARH_vSetVariableDataFromSystemFloat( VARH_ePeltier_U, aflValues[ANPI_eOutputVoltage] );
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_P, aflValues[ANPI_eOutputVoltage] * aflValues[ANPI_eOutputCurrent] );
VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_U, aflValues[ANPI_eSupplyVoltage24V] );
VARH_vSetVariableDataFromSystemFloat( VARH_eSupply_I, aflValues[ANPI_eSupplyCurrent24V] );
diff --git a/startup_stm32l432xx.s b/startup_stm32l432xx.s
index 35d7d60..88343d4 100644
--- a/startup_stm32l432xx.s
+++ b/startup_stm32l432xx.s
@@ -230,7 +230,7 @@ g_pfnVectors:
.word RNG_IRQHandler
.word FPU_IRQHandler
.word CRS_IRQHandler
- .word 0x55AA11EE
+ .word 0xEEAA5522
/*******************************************************************************
diff --git a/tecware.srec b/tecware.srec
index dcf5260..19a73b2 100644
--- a/tecware.srec
+++ b/tecware.srec
@@ -1,4 +1,4 @@
-S00B00007465632E73726563DD
+S00F0000746563776172652E737265632A
S31508002800000001208D220108055C00080B5C000809
S31508002810115C0008175C00081D5C00080000000039
S31508002820000000000000000000000000E11A010896
@@ -23,7 +23,7 @@ S31508002940DD220108DD220108DD220108DD22010859
S31508002950DD220108DD220108DD220108DD22010849
S31508002960DD220108DD220108DD2201080000000041
S31508002970DD220108DD220108000000000000000039
-S31508002980DD220108DD220108DD220108EE11AA5523
+S31508002980DD220108DD220108DD2201082255AAEE12
S3150800299010B5054C237833B9044B13B10448AFF38B
S315080029A000800123237010BD4001002000000000B4
S315080029B0DC24010808B5034B1BB103490348AFF3F0
@@ -189,7 +189,7 @@ S315080033A01360344B1B68002B14BF01230023DBB2C8
S315080033B01A467B6813407B602F4B022201212F4857
S315080033C00AF0C8FE03462E4A13602D4B1B68002BD5
S315080033D014BF01230023DBB21A467B6813407B60C7
-S315080033E0284B0222012125480AF0B4FE0346264A44
+S315080033E0284B0422012125480AF0B4FE0346264A42
S315080033F01360254B1B68002B14BF01230023DBB287
S315080034001A467B6813407B601D4B1B684FF47A7124
S3150800341018460AF01BFF0346002B0CBF01230023A6
@@ -220,7 +220,7 @@ S31508003590F13500081B360008FF2B15D042E0012044
S315080035A000F0F0F83FE0002000F0ECF83BE0294B93
S315080035B01B6840F6B83118460AF048FE33E0002189
S315080035C0132000F0BBFA2EE0002000F0DBF804F030
-S315080035D066FF28E0062387F82030032387F8213082
+S315080035D066FF28E0062387F82030042387F8213081
S315080035E0FA697B7E07F12000022101F05DF81AE0F6
S315080035F0072387F8203000F02FFB0346002B01D065
S31508003600FF2300E0002387F82130FA697B7E07F163
@@ -449,7 +449,7 @@ S315080043E0D7ED057AB0EE670A0B20FFF7B7FBD7EDD6
S315080043F0067AB0EE670A0C20FFF7B0FB97ED057A50
S31508004400D7ED067AC7EE276AB0EE660A0D20FFF7E3
S31508004410A5FB97ED057AD7ED067A67EE277AB0EE13
-S31508004420670A0D20FFF79AFBD7ED037AB0EE670A05
+S31508004420670A0E20FFF79AFBD7ED037AB0EE670A04
S315080044300F20FFF793FBD7ED047AB0EE670A10203A
S31508004440FFF78CFB97ED037AD7ED047A67EE277AA8
S31508004450B0EE670A1120FFF781FB074B1B68184669