diff --git a/include/dataAcquisition.h b/include/dataAcquisition.h index 134e304..8efb0c4 100644 --- a/include/dataAcquisition.h +++ b/include/dataAcquisition.h @@ -5,25 +5,14 @@ #include #include -// Struttura per la gestione dei dati di acquisizione -typedef struct { - int sensorsNumber; - int slidingWindowSize; -} dataAcquisition; - -// Funzioni per la gestione dei dati di acquisizione void initializeReadings(); void freeReadings(); -// Funzioni getter int getSensorsNumber(); int getSlidingWindowSize(); bool isFull(int sensorIndex); -// Funzioni setter void addReading(float value, int sensorIndex); -void setSensorsNumber(int number); -void setSlidingWindowSize(int size); float getAverageOnSensor(int sensorIndex); float getAverageOnAllSensors(); diff --git a/libraries/dataAcquisition.c b/libraries/dataAcquisition.c index db4c99b..87e6d1f 100644 --- a/libraries/dataAcquisition.c +++ b/libraries/dataAcquisition.c @@ -4,11 +4,19 @@ #include // Variable definition - static float **readings; +static int sensorsNumber; +static int slidingWindowSize; + + +static void setSensorsNumber(int number) { + sensorsNumber = number; +} + +static void setSlidingWindowSize(int size) { + slidingWindowSize = size; +} -int sensorsNumber; -int slidingWindowSize; void initializeReadings(int numSensors, int windowSize) { readings = (float **)malloc(numSensors * sizeof(float *)); if (readings == NULL) { @@ -22,7 +30,7 @@ void initializeReadings(int numSensors, int windowSize) { exit(EXIT_FAILURE); } } - // Assign sensorsNumber and slidingWindowSize + // Chiamate private ai setter setSensorsNumber(numSensors); setSlidingWindowSize(windowSize); } @@ -34,13 +42,6 @@ void freeReadings() { free(readings); } -typedef struct -{ - int sensorsNumber; - int slidingWindowSize; -} dataAcquisition; - - // Functions // Get the number of sensors @@ -53,16 +54,6 @@ int getSlidingWindowSize() { return slidingWindowSize; } -// Set the number of sensors -void setSensorsNumber(int number) { - sensorsNumber = number; -} - -// Set the sliding window size -void setSlidingWindowSize(int size) { - slidingWindowSize = size; -} - // Control on the fullness of the sliding window bool isFull(int sensorIndex) { for (int i = 0; i < slidingWindowSize; i++) { diff --git a/test/test_dataAcquisition.c b/test/test_dataAcquisition.c index 1cfeb6b..d8227a2 100644 --- a/test/test_dataAcquisition.c +++ b/test/test_dataAcquisition.c @@ -11,7 +11,6 @@ void test_initializeReadings() { int main() { - printf("Running tests...\n"); test_initializeReadings(); return 0; } \ No newline at end of file