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

Fixed several issues:

Browse Source 
- ADC has now averaging
- Pause screen added
- Fixed display glitches for most parts

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@258 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-10-19 15:24:24 +00:00
parent 51ffde94d7
commit 92bd68d8ba
18 changed files with 257 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/PID.h
View File

@@ -69,6 +69,8 @@ struct Pid
* @param Kp proportional constant
* @param Ki integration constant
* @param Kd differential constant
* @param iMin Minimum value for integrator
* @param iMax Maximum value for integrator
*
* @return ErrorStatus SUCCESS if initialisation was successful
* ERRROR otherwise
@@ -79,6 +81,20 @@ struct Pid
extern ErrorStatus PID_construct(struct Pid* self, int Kp, int Ki, int Kd, int iMin, int iMax);
/** ----------------------------------------------------------------------------
* PID_destruct
* Destructor for a PID regulator
*
* @param self PID object to destruct
*
* @return void
*
* @todo
* -----------------------------------------------------------------------------
*/
extern void PID_destruct(struct Pid* self);
/** ----------------------------------------------------------------------------
* PID_calculate
* Calculate

22
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/Interlock.c
View File

@@ -145,16 +145,28 @@ static void InterlockTask (void* parameters)
while(1)
{
// Interlock was OK when the IRQ became active
// This tasks debounces the Interlock against accidental detections
// THe semaphore is given from ISR
xSemaphoreTake(self->semaphore, portMAX_DELAY);
// Wait for the debounce time
vTaskDelay(self->waitToDebounce_ms);
if (self->ID == COMMON_INTERLOCK)
// Check if the Interrupt was justified
if (!Interlock_isClosed(self))
{
Error_postError(INTERLOCK_COMMON_FAIL);
// The Interlock is open, so the Interrupt was justified
if (self->ID == COMMON_INTERLOCK)
{
Error_postError(INTERLOCK_COMMON_FAIL);
}
else if (self->ID == TESLA_INTERLOCK)
{
Error_postError(INTERLOCK_TESLA_FAIL);
}
}
else if (self->ID == TESLA_INTERLOCK)
else
{
Error_postError(INTERLOCK_TESLA_FAIL);
// False alarm
}
}
}

6
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/PID.c
View File

@@ -89,6 +89,12 @@ ErrorStatus PID_construct(struct Pid* self, int Kp, int Ki, int Kd, int iMin, in
}
void PID_destruct(struct Pid* self)
{
self->initialized = false;
}
int PID_calculate(struct Pid* self, int error)
{
int returnValue = 0;

11
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/nhd0420.c
View File

@@ -397,12 +397,21 @@ static ErrorStatus write(const struct DisplayDevice* self, const char* buffer, s
ErrorStatus returnValue = SUCCESS;
if (self->initialized)
{
if ((length + column) > NHD0420_NUMBER_OF_COLUMNS)
{
returnValue = ERROR;
}
// Set cursor on display
returnValue = NHD0420_setCursorToPosition((const struct NHD0420*)self, row, column);
if (returnValue == SUCCESS)
{
returnValue = NHD0420_sendData((const struct NHD0420*)self, buffer, length);
int loopcounter;
for (loopcounter = 0; loopcounter < length; loopcounter++)
{
returnValue = NHD0420_sendData((const struct NHD0420*)self, &buffer[loopcounter], 1);
}
}
}
else