fixed build errors

main
Jonas Arnold 4 years ago
parent 92f99dfb58
commit b91e301939
  1. 22
      ADIS_tinyK22_SplitFlap/source/splitflap.c
  2. 14
      ADIS_tinyK22_SplitFlap/source/splitflap.h

@ -9,18 +9,24 @@
#include "McuULN2003.h" #include "McuULN2003.h"
SF_Handle_t SF_Init(SF_Config_t* instance, int id){ SF_Handle_t SF_Init(SF_Config_t* instance, int id){
SF_t splitflap; SF_t* splitflap;
splitflap.magSensor = McuGPIO_InitGPIO(&instance->magSensorConfig); #if SPLITFLAP_CONFIG_USE_FREERTOS_HEAP
splitflap.motor = McuULN2003_InitMotor(&instance->motorConfig); splitflap = (SF_t*)pvPortMalloc(sizeof(SF_t)); /* get a new device descriptor */
splitflap.id = id; #else
splitflap = (SF_t*)malloc(sizeof(SF_t)); /* get a new device descriptor */
#endif
return &splitflap; splitflap->magSensor = McuGPIO_InitGPIO(&instance->magSensorConfig);
splitflap->motor = McuULN2003_InitMotor(&instance->motorConfig);
splitflap->id = id;
return splitflap;
} }
void SF_Deinit(SF_t* instance){ void SF_Deinit(SF_Handle_t instance){
McuULN2003_DeinitMotor(&instance->motorConfig); McuULN2003_DeinitMotor(((SF_t*)instance)->motor);
McuGPIO_DeinitGPIO(&instance->magSensorConfig); McuGPIO_DeinitGPIO(((SF_t*)instance)->magSensor);
} }

@ -11,6 +11,12 @@
#include "McuULN2003.h" #include "McuULN2003.h"
#include "McuGPIO.h" #include "McuGPIO.h"
/****** SETTINGS ******/
#define SPLITFLAP_CONFIG_USE_FREERTOS_HEAP 0
/****** TYPES ******/
/* define splitflap handle type. SF_Handle_t points to SF_t */ /* define splitflap handle type. SF_Handle_t points to SF_t */
typedef void* SF_Handle_t; typedef void* SF_Handle_t;
@ -25,10 +31,14 @@ typedef struct {
McuGPIO_Config_t magSensorConfig; McuGPIO_Config_t magSensorConfig;
} SF_Config_t; } SF_Config_t;
/* split flap initialization */
/****** FUNCTIONS ******/
/* split flap initialization
* only pass configured types, they do not need to be initialized.
* Initialization will be made inside the SF_Init method */
SF_Handle_t SF_Init(SF_Config_t* instance, int id); SF_Handle_t SF_Init(SF_Config_t* instance, int id);
/* split flap deinitialization */ /* split flap deinitialization */
void SF_Deinit(SF_Handle_t* instance); void SF_Deinit(SF_Handle_t instance);
#endif /* SPLITFLAP_H_ */ #endif /* SPLITFLAP_H_ */

Loading…
Cancel
Save