use constants for schedule timing
This commit is contained in:
@ -9,6 +9,8 @@
|
|||||||
#define DISPLAY_H_
|
#define DISPLAY_H_
|
||||||
|
|
||||||
|
|
||||||
|
const uint32_t DISPLAY_CYCLE = 10;
|
||||||
|
|
||||||
void displayInit(void *handleArg);
|
void displayInit(void *handleArg);
|
||||||
void displayExec(void *handleArg);
|
void displayExec(void *handleArg);
|
||||||
void displaySetValue(uint8_t v);
|
void displaySetValue(uint8_t v);
|
||||||
|
13
src/main.c
13
src/main.c
@ -15,7 +15,6 @@
|
|||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "displayMuxer.h"
|
#include "displayMuxer.h"
|
||||||
#include "PontCoopScheduler.h"
|
#include "PontCoopScheduler.h"
|
||||||
// #include "testTask.h"
|
|
||||||
#include "measure.h"
|
#include "measure.h"
|
||||||
|
|
||||||
|
|
||||||
@ -38,20 +37,12 @@ int main() {
|
|||||||
displayInit(NULL);
|
displayInit(NULL);
|
||||||
__disable_interrupt();
|
__disable_interrupt();
|
||||||
|
|
||||||
// tTestTaskHandle testTaskHandle1;
|
|
||||||
// testTaskInit(&testTaskHandle1, TESTPIN1);
|
|
||||||
//
|
|
||||||
// tTestTaskHandle testTaskHandle2;
|
|
||||||
// testTaskInit(&testTaskHandle2, TESTPIN2);
|
|
||||||
|
|
||||||
measureInit(NULL);
|
measureInit(NULL);
|
||||||
// displayMuxerInit(NULL);
|
// displayMuxerInit(NULL);
|
||||||
|
|
||||||
|
|
||||||
schAdd(displayExec, NULL, 0, 10);
|
schAdd(displayExec, NULL, 0, DISPLAY_CYCLE);
|
||||||
// schAdd(testTaskExec, &testTaskHandle1, 0, 20);
|
schAdd(measureStartConversion, NULL, 0, MEASURE_CYCLE);
|
||||||
// schAdd(testTaskExec, &testTaskHandle2, 2, 20);
|
|
||||||
schAdd(measureStartConversion, NULL, 0, 1000);
|
|
||||||
// schAdd(displayMuxerExec, NULL, 0, 500);
|
// schAdd(displayMuxerExec, NULL, 0, 500);
|
||||||
|
|
||||||
__enable_interrupt();
|
__enable_interrupt();
|
||||||
|
@ -36,11 +36,13 @@ void measureCollectAndProcessConversion(void *handleArg);
|
|||||||
void measureStartConversion(void *handleArg) {
|
void measureStartConversion(void *handleArg) {
|
||||||
//gpioSetPin(TESTPIN1, HIGH);
|
//gpioSetPin(TESTPIN1, HIGH);
|
||||||
ADC10CTL0 |= ENC | ADC10SC;
|
ADC10CTL0 |= ENC | ADC10SC;
|
||||||
schAdd(measureCollectAndProcessConversion, NULL, 10, 0);
|
schAdd(measureCollectAndProcessConversion, NULL, MEASURE_FETCH_RESULT_DELAY, 0);
|
||||||
//gpioSetPin(TESTPIN1, LOW);
|
//gpioSetPin(TESTPIN1, LOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
void measureCollectAndProcessConversion(void *handleArg) {
|
void measureCollectAndProcessConversion(void *handleArg) {
|
||||||
|
|
||||||
|
|
||||||
//gpioSetPin(TESTPIN2, HIGH);
|
//gpioSetPin(TESTPIN2, HIGH);
|
||||||
uint16_t n = 0xffff;
|
uint16_t n = 0xffff;
|
||||||
if ((ADC10CTL0 & ADC10IFG) != 0) {
|
if ((ADC10CTL0 & ADC10IFG) != 0) {
|
||||||
|
@ -12,6 +12,10 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const uint32_t MEASURE_CYCLE = 20;
|
||||||
|
const uint32_t MEASURE_FETCH_RESULT_DELAY = 5;
|
||||||
|
const uint8_t AVERAGING_COUNT = 100;
|
||||||
|
|
||||||
|
|
||||||
void measureInit(void *handleArg);
|
void measureInit(void *handleArg);
|
||||||
void measureStartConversion(void *handleArg);
|
void measureStartConversion(void *handleArg);
|
||||||
|
Reference in New Issue
Block a user