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

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

@@ -35,6 +35,7 @@
#include "ADConverters.h"
#include "DAConverters.h"
#include "DeviceParameters.h"
#include "Displays.h"
#include "Error.h"
#include "hsb-mrts.h"
@@ -43,6 +44,7 @@
#include "repairMenus.h"
#include "repairProcess.h"
#include "repairProcesses.h"
#include "Warning.h"
#include "misc.h"
#include "stm32f10x_rcc.h"
@@ -100,12 +102,12 @@ static xTaskHandle initTaskHandle;
static xTaskHandle ledTaskHandle;
static xTaskHandle sysTaskHandle;
static struct HwValidationMenu _hwValidation = {.initialized = false};
static struct HwValidationMenuItems hwTestItems;
struct HwValidationMenu* hwValidation = &_hwValidation;
//static struct HwValidationMenu _hwValidation = {.initialized = false};
//static struct HwValidationMenuItems hwTestItems;
//struct HwValidationMenu* hwValidation = &_hwValidation;
static struct CachedStorage cs = {.initialized = false};
static struct CachedStorage deviceParameters = {.initialized = false};
// -----------------------------------------------------------------------------
// Function declarations
@@ -151,7 +153,7 @@ void vApplicationTickHook ()
static void printSystemInfoTask(void* parameters)
{
while (1)
// while (1)
{
LOGGER_INFO(mainLog, "---------------------------------------");
systeminfoCommandHandler();
@@ -195,6 +197,9 @@ static void initTask(void* parameters)
// Create the error handler
Error_construct();
// Create the warning handler
Warning_construct();
// Initialize the platform first
// All IO is initialized here
// Also, all periphery and platform-specifics are initialized here
@@ -213,13 +218,15 @@ static void initTask(void* parameters)
// Construct the DA Converters
DAConverters_construct();
// Construct the repair presets
RepairPresets_construct(&cs, &iFlash->memoryDevice);
hsb_generateStartScreen(mainDisplay);
// Let start screen stay for 5 seconds
// vTaskDelay(INIT_START_SCREEN_DELAY);
vTaskDelay(INIT_START_SCREEN_DELAY);
// Construct/Load the device parameters
DeviceParameters_construct(&deviceParameters, &iFlash->memoryDevice);
// Construct the repair presets
RepairPresets_construct(&cs, &iFlash->memoryDevice);
///TODO MUST BE UPDATED
// hwTestItems.display = &nhd0420->displayDevice;
@@ -245,7 +252,7 @@ static void initTask(void* parameters)
// Create task that repeats to print out TASK information on the logger
// xTaskCreate(printSystemInfoTask, (const char* const)"SysInfoTask", 512, NULL, 0, &sysTaskHandle);
xTaskCreate(printSystemInfoTask, (const char* const)"SysInfoTask", 512, NULL, 0, &sysTaskHandle);
// Delete this init task
vTaskDelete(NULL);