diff --git a/bsp_z7/objects/ObjectFactory.cpp b/bsp_z7/objects/ObjectFactory.cpp index 739cb57..454d454 100644 --- a/bsp_z7/objects/ObjectFactory.cpp +++ b/bsp_z7/objects/ObjectFactory.cpp @@ -3,7 +3,9 @@ #include #include #include + #include +#include #include "fsfw/events/EventManager.h" #include "fsfw/health/HealthTable.h" @@ -60,4 +62,5 @@ void ObjectFactory::produce(void *args) { new TmManager(objects::TM_MANAGER); new PrintController(123); + new BlinkController(124); } diff --git a/mission/controller/BlinkController.cpp b/mission/controller/BlinkController.cpp index 9cb8edc..e95f3be 100644 --- a/mission/controller/BlinkController.cpp +++ b/mission/controller/BlinkController.cpp @@ -7,6 +7,7 @@ BlinkController::BlinkController(object_id_t setObjectId) ReturnValue_t BlinkController::initialize() { ReturnValue_t result = SystemObject::initialize(); + printf("Initializing Blinking"); if (result != returnvalue::OK) { return result; } @@ -15,12 +16,16 @@ ReturnValue_t BlinkController::initialize() { config.DeviceId = 4; // chosen by fair dice throw config.BaseAddr = XPS_GPIO_BASEADDR; s32 returncode = XGpioPs_CfgInitialize(&gpio, &config, XPS_GPIO_BASEADDR); + printf("Configured XGPIO"); if (returncode != 0) { return returnvalue::FAILED; } XGpioPs_SetDirection(&gpio, 0, (1 << 7)); XGpioPs_SetOutputEnable(&gpio, 0, (1 << 7)); XGpioPs_WritePin(&gpio, 7, 1); + printf("Blinking is initialized"); + XGpioPs_WritePin(&gpio, 7, 0); + printf("Value written once"); return returnvalue::OK; } diff --git a/mission/controller/BlinkController.h b/mission/controller/BlinkController.h index b7c23b7..acd5199 100644 --- a/mission/controller/BlinkController.h +++ b/mission/controller/BlinkController.h @@ -1,10 +1,10 @@ #pragma once -#include #include #include +#include class BlinkController: public SystemObject, public ExecutableObjectIF { public: diff --git a/mission/main.cpp b/mission/main.cpp index 909c40e..584b393 100644 --- a/mission/main.cpp +++ b/mission/main.cpp @@ -208,16 +208,17 @@ void mission(void *){ currPrio = 2; PeriodicTaskIF* controllerTask = taskFactory->createPeriodicTask( - "controller", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1, nullptr); + "controller", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2, nullptr); controllerTask->addComponent(123); printf("Created Tasks\n"); controllerTask->startTask(); + currPrio = 3; PeriodicTaskIF* blinkTask = taskFactory->createPeriodicTask( - "controllerBlink", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1, nullptr); + "blink", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1, nullptr); blinkTask->addComponent(124); printf("Created Tasks\n");