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

bugs offset measurements

Browse Source
This commit is contained in:
Noah Piqué
2021-11-19 15:29:10 +01:00
parent 8c54032298
commit d7b1b28616
7 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.settings/stm32cubeide.project.prefs
View File

@ -1,4 +1,5 @@
2F62501ED4689FB349E356AB974DBE57=DAEBCB59B6A9C8F02BB774C81C53DE27
66BE74F758C12D739921AEA421D593D3=4
8DF89ED150041C4CBC7CB9A9CAA90856=E865512A8728EAFAAFCAEC43A97E0BA4
DC22A860405A8BF2F2C095E5B6529F12=E865512A8728EAFAAFCAEC43A97E0BA4
8DF89ED150041C4CBC7CB9A9CAA90856=DAEBCB59B6A9C8F02BB774C81C53DE27
DC22A860405A8BF2F2C095E5B6529F12=6E3170594736B6A8C2809AF37BE21851
eclipse.preferences.version=1

2
Core/Application/INIT_Initialization.c
View File

@ -46,6 +46,7 @@
// Drivers
//#include "../Drivers/IRQH_IntRequestHandler.h"
//#include "../Drivers/MRAM_MRam.h"
#include "../Drivers/USFL_UserFlash.h"
#include "../Drivers/ANPI_AnalogPortsIn.h"
#include "../Drivers/ANPO_AnalogPortsOut.h"
#include "../Drivers/SPID_SpiDriver.h"
@ -166,6 +167,7 @@ PRIVATE VOID vInitTask( PVOID arg )
BOOL boInitConfig = TRUE;
// boOK &= RTOS_boInitializeModule();
boOK &= USFL_boInitializeModule();
boOK &= DIPO_boInitializeModule();
boOK &= ANPI_boInitializeModule();

27
Core/Drivers/ADCD_AdcDriver.c
View File

@ -88,7 +88,7 @@
#define FAULT_RTDINLOW 0x08
#define FAULT_OVUV 0x04
#define CONFIG (U8)(CONFIG_VBIAS_ON | CONFIG_MODE_OFF | CONFIG_24WIRE | CONFIG_FAULTCYCLE_AUTO | CONFIG_FILT60HZ) // enable Vbias; autoconvert off; 4-wire; Fault detection auto 60Hz;
#define CONFIG (U8)(CONFIG_VBIAS_ON | CONFIG_MODE_OFF | CONFIG_24WIRE | CONFIG_FILT60HZ) // enable Vbias; autoconvert off; 4-wire; 60Hz;
#define EVENT_ENABLE ((U32)(1<<0))
#define EVENT_DISABLE ((U32)(1<<1))
@ -210,13 +210,21 @@ BOOL ADCD_boInitializeModule( VOID )
DIPO_vSetOutput(DIPO_eCS_C);
boOK &= boWriteReg(REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE);
DIPO_vResetOutput(DIPO_eCS_C);
DIPO_vSetOutput(DIPO_eCS_C);
boOK &= boWriteReg(REG_HIGH_FAULT_MSB, (U16) 0x5b12 , TRUE);
DIPO_vResetOutput(DIPO_eCS_C);
DIPO_vSetOutput(DIPO_eCS_C);
boOK &= boWriteReg(REG_LOW_FAULT_MSB, (U16) 0x2690 , TRUE);
DIPO_vResetOutput(DIPO_eCS_C);
DIPO_vSetOutput(DIPO_eCS_H);
boOK &= boWriteReg(REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE);
DIPO_vResetOutput(DIPO_eCS_H);
DIPO_vSetOutput(DIPO_eCS_H);
boOK &= boWriteReg(REG_HIGH_FAULT_MSB, (U16) 0x5b12 , TRUE);
DIPO_vResetOutput(DIPO_eCS_H);
DIPO_vSetOutput(DIPO_eCS_H);
boOK &= boWriteReg(REG_LOW_FAULT_MSB, (U16) 0x2690 , TRUE);
DIPO_vResetOutput(DIPO_eCS_H);
@ -278,7 +286,12 @@ BOOL ADCD_dReadData(ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data)
osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput(CS);
boOK &= boReadReg(REG_FAULT_STATUS, &u16Data, FALSE);
boWriteReg(REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE);
DIPO_vResetOutput(CS);
DIPO_vSetOutput(CS);
boOK &= boWriteReg(REG_CONFIG, (U16) CONFIG | CONFIG_FAULTSTATCLEAR, FALSE);
DIPO_vResetOutput(CS);
DIPO_vSetOutput(CS);
boOK &= boReadReg(REG_HIGH_FAULT_MSB, &u16Data, TRUE);
DIPO_vResetOutput(CS);
osMutexRelease( m_pstMutexID );
@ -290,6 +303,16 @@ BOOL ADCD_dReadData(ADCD_EnTemps eChannel, PU8 pu8Error, PU16 pu16Data)
*pu16Data = u16Data;
osMutexAcquire( m_pstMutexID, osWaitForever );
DIPO_vSetOutput(CS);
boOK &= boWriteReg(REG_CONFIG, CONFIG | CONFIG_FAULTCYCLE_AUTO , FALSE);
DIPO_vResetOutput(CS);
osMutexRelease( m_pstMutexID );
return( boOK );
}

4
Core/Drivers/ANPI_AnalogPortsIn.c
View File

@ -145,10 +145,10 @@ LOCAL CONST FLOAT m_aflOffset1[ANPI_eInNumberOfInputs] =
// Order must fit enumeration "ANPI_EnAnalogInput"
LOCAL CONST FLOAT m_aflOffset2[ANPI_eInNumberOfInputs] =
{
18.788f, // 00 ANPI_eControlVoltage
20.088f, // 00 ANPI_eControlVoltage
0.0f, // 01 ANPI_eSupplyVoltage24V
0.0f, // 02 ANPI_eSupplyCurrent24V
18.788f, // 03 ANPI_eOutputVoltage
20.088f, // 03 ANPI_eOutputVoltage
0.0f, // 04 ANPI_eOutputCurrent
};

3
Core/Drivers/PECO_PeltierController.h
View File

@ -7,7 +7,7 @@
//-------------------------------------------------------------------------------------------------
//
// Project: Peltier Controller V2
// Author: Noah Piqu<71> (noah.pique@psi.ch)
// Author: Noah Piqu<71> (noah.pique@psi.ch)
//
//-------------------------------------------------------------------------------------------------
//
@ -87,6 +87,7 @@ extern "C" {
BOOL PECO_boInitializeModule( VOID );
BOOL PECO_boSetTemperature( S16 Temperature );
VOID PECO_Enable( BOOL Enable );
BOOL PECO_isEnabled( VOID );
#ifdef __cplusplus
}

2
PeltierControllerV3 Debug.launch
View File

@ -89,6 +89,6 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;"/>
<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;&gt;&lt;gdbmemoryBlockExpression address=&quot;134346752&quot; label=&quot;0x801F800&quot;/&gt;&lt;/memoryBlockExpressionList&gt;"/>
<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
</launchConfiguration>

10
STM32L432KBUX_FLASH.ld
View File

@ -48,12 +48,20 @@ MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K
RAM2 (xrw) : ORIGIN = 0x10000000, LENGTH = 16K
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 128K
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 128K-2K
DATA (rwx) : ORIGIN = 0x801F800, LENGTH = 2K
}
/* Sections */
SECTIONS
{
/* NOLOAD is required for not ereasing this block */
.user_data (NOLOAD) :
{
. = ALIGN(4);
*(.user_data)
. = ALIGN(4);
} > DATA
/* The startup code into "FLASH" Rom type memory */
.isr_vector :
{