File content as of revision 33:2ee6fbdad7b4:

#include "mbed.h"
#include "x_nucleo_iks01a1.h"
#include <vector>
#include "sensor.h"
#include "userMethods.h"

// Queue

Queue<log_data, QUEUESIZE> ExpansionBoard::queue;
std::vector<log_data> ExpansionBoard::v;
int * ExpansionBoard::n;
bool ExpansionBoard::flag;

//This is the producer
void ExpansionBoard::sampleData()
{
    if(flag) printf("\nAbout to alloc\n");
    log_data *log_d;

    if (log_d == NULL) {
        queue.get();
        if(flag) printf("Out of memory, last sample deleted\n");
        log_data* log_d;
        if(flag) printf("Allocated after out of memory\n");
    }


    if(flag) printf("Not null, reading values\n");
    //Store read data in a sample
    float value;
    log_d->date = time(NULL);
    temp_sensor->GetTemperature(&value);
    log_d->tempCelsius = value;
    humidity_sensor->GetHumidity(&value);
    log_d->humidity = value;
    pressure_sensor->GetPressure(&value);
    log_d->pressure = value;
    if(flag) printf("All values STORED\n");
    //Send pointer to sample to the queue
    queue.put(log_d);
  
    //v.push_back(*log_d);
    printf("After vector");
  
  
}

// This is the consumer

void ExpansionBoard::getData(const void*)
{

    while(true) {
        //Block on queue if no data is available
        osEvent event = queue.get(2000);
        if(flag) {
            printf("MAIL_BOX.GET\n");
        }

        if (event.status == osEventMail) {
            // Successful, store log_data
            log_data* temp = (log_data*) event.value.p;
            v.push_back(*temp);
            if(flag) {
                printf("GET value stored and freed up mail_box\n");
            }
        }
    }
}


// Helper function for printing floats & doubles
char *ExpansionBoard::printDouble(char* str, double v, int decimalDigits)
{
    int intPart, fractPart, len, i=1;
    char *ptr;
    for (; decimalDigits!=0; i*=10, decimalDigits--);
    intPart = (int)v;
    fractPart = (int)((v-(double)(int)v)*i);
    sprintf(str, "%i.", intPart);
    len = strlen(str);
    ptr = &str[len];
    for (i/=10; i>1; i/=10, ptr++) {
        if(fractPart >= i) break;
        *ptr = '0';
    }
    sprintf(ptr, "%i", fractPart);
    return str;
}

// Constructor for the class 
ExpansionBoard::ExpansionBoard(int num, bool lFlag): T(15.0f)
{
    n = &num;
    flag = &lFlag;

    /* Retrieve the composing elements of the expansion board */
    printf("Initialising expansion board...\n\r");
}