private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed multiple bugs and errors.

Browse Source 
- Added WARNING handler
- put voltage calculations to dedicated module

fixed last errors. Updated menu repair screen without ERROR from PID 

This is version 0.9.0.3, which is used for the first duration test
Will also be tagged

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@272 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-11-15 15:40:39 +00:00
parent 17207a3a4b
commit 711f8e72be
46 changed files with 2572 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/DAConverter.c
View File

@@ -25,9 +25,8 @@
// Include files
// -----------------------------------------------------------------------------
#include <stdlib.h>
#include "DAConverter.h"
#include "Voltage.h"
#include "Logger.h"
@@ -52,8 +51,6 @@
// Function declarations
// -----------------------------------------------------------------------------
static uint32_t calculateDACValue(const struct DAConverter* self, int voltage);
// -----------------------------------------------------------------------------
// Function definitions
// -----------------------------------------------------------------------------
@@ -83,7 +80,7 @@ void DAConverter_destruct(struct DAConverter* self)
extern ErrorStatus DAConverter_setOutputVoltage(const struct DAConverter* self, int voltage)
ErrorStatus DAConverter_setOutputVoltage(const struct DAConverter* self, int voltage)
{
ErrorStatus returnValue = SUCCESS;
if (returnValue == SUCCESS)
@@ -91,7 +88,7 @@ extern ErrorStatus DAConverter_setOutputVoltage(const struct DAConverter* self,
if (self->initialized)
{
uint32_t dacValue;
dacValue = calculateDACValue(self, voltage);
dacValue = Voltage_calculateDeviceValue(voltage, self->dacDevice->resolutionInBits, self->minVoltage, self->maxVoltage);
DACDevice_write(self->dacDevice, dacValue);
}
}
@@ -103,23 +100,15 @@ extern ErrorStatus DAConverter_setOutputVoltage(const struct DAConverter* self,
}
static uint32_t calculateDACValue(const struct DAConverter* self, int voltage)
uint32_t DAConverter_getCurrentValue(const struct DAConverter* self)
{
uint32_t dacValue;
uint32_t returnValue = 0;
if (self->initialized)
{
int maxDacValue = ((1 << self->dacDevice->resolutionInBits) - 1);
int tempValue = (voltage - self->minVoltage) * maxDacValue;
tempValue /= (self->maxVoltage - self->minVoltage);
dacValue = abs(tempValue);
if (dacValue > maxDacValue)
{
dacValue = maxDacValue;
}
returnValue = Voltage_calculateVoltage(DACDevice_getCurrentValue(self->dacDevice), self->dacDevice->resolutionInBits, self->minVoltage, self->maxVoltage);
}
else
{
dacValue = 0;
}
return dacValue;
return returnValue;
}