AND
Exluding ZMOD
Dependencies: iAQ_Core Adafruit_SGP30_mbed mbed BME680
Revision 6:96de1304b9e7, committed 2020-05-29
- Comitter:
- christodoulos
- Date:
- Fri May 29 11:28:45 2020 +0000
- Parent:
- 5:44f7dbc5c75d
- Commit message:
- Excluding ZMOD;
Changed in this revision
diff -r 44f7dbc5c75d -r 96de1304b9e7 Adafruit_SGP30_mbed.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Adafruit_SGP30_mbed.lib Fri May 29 11:28:45 2020 +0000 @@ -0,0 +1,1 @@ +https://os.mbed.com/users/ndrs_cwt/code/Adafruit_SGP30_mbed/#41a622cdd86d
diff -r 44f7dbc5c75d -r 96de1304b9e7 BME680.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/BME680.lib Fri May 29 11:28:45 2020 +0000 @@ -0,0 +1,1 @@ +https://os.mbed.com/users/mcm/code/BME680/#8aefe9304f85
diff -r 44f7dbc5c75d -r 96de1304b9e7 main.cpp
--- a/main.cpp Fri May 01 14:31:45 2020 +0000
+++ b/main.cpp Fri May 29 11:28:45 2020 +0000
@@ -1,61 +1,199 @@
#include "mbed.h"
#include "iAQ_Core.h"
-
-iAQ_Core myiAQ_Core ( PB_11,PB_10, iAQ_Core::iAQ_Core_ADDRESS );
+#include "Adafruit_SGP30.h"
+#include"BME680.h"
+BME680 myBME680 ( PC_1,PC_0, 400000 ); //BME680
+iAQ_Core myiAQ_Core ( PB_11_ALT0,PB_10_ALT0, iAQ_Core::iAQ_Core_ADDRESS ); //iAQ-Core C
+Adafruit_SGP30 sgp30(PB_14,PB_13); // SGP30
+I2C ZMODtemp(PB_9, PB_8); //ZMOD and Si7050
Serial ble(PC_12,PD_2);
-Ticker newReading;
-
iAQ_Core::iAQ_Core_status_t aux;
iAQ_Core::iAQ_Core_data_t myiAQ_Core_data;
-uint32_t myState = 0;
+
+///BME680 EXTRA FUNCTIONS///
+Ticker newReading;
+
+uint32_t myState = 0;
+//@brief FUNCTION PROTOTYPES
+void changeDATA ( void );
+void user_delay_ms ( uint32_t period );
+int8_t user_i2c_read ( uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len );
+int8_t user_i2c_write ( uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len );
void changeDATA ( void )
{
myState = 1;
}
+void user_delay_ms ( uint32_t period )
+{
+ wait( 0.01 );
+}
-int main()
+int8_t user_i2c_read ( uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len )
{
- ble.baud(9600);
-
- uint32_t myWarmUpCounter = 0;
+ int8_t rslt = 0; // Return 0 for Success, non-zero for failure
+
+ uint32_t aux = 0;
+ aux = myBME680._i2c.write ( dev_id, (char*)®_addr, 1, true );
+ aux = myBME680._i2c.read ( dev_id, (char*)®_data[0], len );
+
+
+
+ if ( aux == 0 ) {
+ rslt = 0;
+ } else {
+ rslt = 0xFF;
+ }
+
+
+ return rslt;
+}
+
+int8_t user_i2c_write ( uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len )
+{
+ int8_t rslt = 0; // Return 0 for Success, non-zero for failure
+
+ uint32_t aux = 0;
+ char cmd[16] = { 0 };
+ uint32_t i = 0;
+
+ // Prepare the data to be sent
+ cmd[0] = reg_addr;
+ for ( i = 1; i <= len; i++ ) {
+ cmd[i] = reg_data[i - 1];
+ }
+
+ // Write data
+ aux = myBME680._i2c.write ( dev_id, &cmd[0], len + 1, false );
- // iAQ-Core warm up is at least 5 minutes ( 300 * 1s ) or when the sensor is ready
- do
- {
- aux = myiAQ_Core.iAQ_Core_GetNewReading ( &myiAQ_Core_data );
- wait(1);
- myWarmUpCounter++;
- } while( ( myWarmUpCounter < 300 ) && ( myiAQ_Core_data.status == iAQ_Core::iAQ_Core_STATUS_RUNIN ) );
+ if ( aux == 0 ) {
+ rslt = 0;
+ } else {
+ rslt = 0xFF;
+ }
+
+
+ return rslt;
+}
- newReading.attach( &changeDATA, 0.1); // the address of the function to be attached ( changeDATA ) and the interval ( 1s )
+int main()
+{
+ ble.baud(115200); //baudrate for the serial connection, 9600 for hc05 115200 for rn
- // Let the callbacks take care of everything
- while(1)
- {
- sleep();
+ ble.printf("$");//enter command mode only for rn
+ wait(0.1);
+ ble.printf("$$");//enter command mode
+ wait(0.5);
+ ble.printf("SN,Testing 1 2 1 2 \r");//set new name
+ wait(0.5);
+ ble.printf("SS,C0\r");//set transparent uart
+ wait(0.5);
+ ble.printf("&,50278635E070\r");//Assign mac
+ wait(0.5);
+ ble.printf("---\r");//enter data mode
+ wait(0.5);
+
+ ///IAQ DOESN'T REQUIRE INITIALISATION///
+
+ ///SGP30///
+ sgp30.begin();//begin sgp30
+ sgp30.IAQinit();//initialise sgp30
+
+
+
+ ///BME680//
+ struct bme680_dev gas_sensor;
+
+ gas_sensor.dev_id = BME680_I2C_ADDR_PRIMARY;
+ gas_sensor.intf = BME680_I2C_INTF;
+ gas_sensor.read = user_i2c_read;
+ gas_sensor.write = user_i2c_write;
+ gas_sensor.delay_ms = user_delay_ms;
+ // amb_temp can be set to 25 prior to configuring the gas sensor
+ // or by performing a few temperature readings without operating the gas sensor.
+ gas_sensor.amb_temp = 25;
+
+
+ int8_t rslt = BME680_OK;
+ rslt = myBME680.bme680_init ( &gas_sensor );
+ uint8_t set_required_settings;
- if ( myState == 1 ) {
- // New reading
- do {
- aux = myiAQ_Core.iAQ_Core_GetNewReading ( &myiAQ_Core_data );
- wait_ms(1);
- } while( myiAQ_Core_data.status != iAQ_Core::iAQ_Core_STATUS_OK ); // [TODO] Dangerous!!! The uC may get stuck here if something goes wrong!
- // [WORKAROUND] Insert a counter.
+ // Set the temperature, pressure and humidity settings
+ gas_sensor.tph_sett.os_hum = BME680_OS_2X;
+ gas_sensor.tph_sett.os_pres = BME680_OS_4X;
+ gas_sensor.tph_sett.os_temp = BME680_OS_8X;
+ gas_sensor.tph_sett.filter = BME680_FILTER_SIZE_3;
+
+ // Set the remaining gas sensor settings and link the heating profile
+ gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
+ // Create a ramp heat waveform in 3 steps
+ gas_sensor.gas_sett.heatr_temp = 320; // degree Celsius
+ gas_sensor.gas_sett.heatr_dur = 150; // milliseconds
+
+ // Select the power mode
+ // Must be set before writing the sensor configuration
+ gas_sensor.power_mode = BME680_FORCED_MODE;
+
+ // Set the required sensor settings needed
+ set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
+
+ // Set the desired sensor configuration
+ rslt = myBME680.bme680_set_sensor_settings ( set_required_settings, &gas_sensor );
+
+ // Set the power mode
+ rslt = myBME680.bme680_set_sensor_mode ( &gas_sensor );
+
+
+ // Get the total measurement duration so as to sleep or wait till the measurement is complete
+ uint16_t meas_period;
+ myBME680.bme680_get_profile_dur ( &meas_period, &gas_sensor );
+
+ struct bme680_field_data data;
+
- // Send data through the UART
- ble.printf( "Pred: %d | Tvoc: %d | Resistance: %d\r\n", myiAQ_Core_data.pred, myiAQ_Core_data.Tvoc, myiAQ_Core_data.resistance );
- wait(0.01);
- myState = 0; // Reset the variable
+ newReading.attach( &changeDATA, 1 ); // the address of the function to be attached ( changeDATA ) and the interval ( 1s )
+
+ //END BME680///
+
+ ///ZMOD AND TEMP///
+ int ZMODTEMPaddr=0x80; //si7050 8bit address
+
+ char wTemp[1];
+ wTemp[0]=0xE3; //Hold master mode
+ char rTemp[2]; //Temperature returns MSB and LSB
+ //assume MBS in rTemp[0] and LSB in rTemp[1]
+
+ char wInit[2];
+ wInit[0]=0xE6; //User register 1
+ wInit[1]=0x00; //Set 14 bit resolution, other read-ony registers shouldn't be affected
+
+ ZMODtemp.write(ZMODTEMPaddr,wInit,2);
+ ///END ZMOD AND TEMP///
+
+ while(1)
+ {
+ myiAQ_Core.iAQ_Core_GetNewReading ( &myiAQ_Core_data ); //Measurement from iAQ-Core C
+ wait(0.1);
+ sgp30.IAQmeasure();//Measurement from SGP30
+
+ rslt = myBME680.bme680_get_sensor_data ( &data, &gas_sensor ); //Measurement for BME680
+
+ ZMODtemp.write(ZMODTEMPaddr,wInit,2); //maybe?
+ ZMODtemp.write(ZMODTEMPaddr,wTemp,1);
+ ZMODtemp.read(ZMODTEMPaddr,rTemp,2); //Returns 2 bytes
+ float temp_code=(rTemp[0]<<8)+rTemp[1];
+ float SiTemp=((175.72*temp_code)/65536)-46.85;
+
+ ble.printf( "iAQ CO2: %d, iAQ VOC: %d, iAQ Resistance: %d, SGP30 CO2: %d, SGP30 VOC: %d, BME680 Res: %d, BME680 Temp: %.2f, BME680 Hum: %.2f, BME680 Pres: %.2f, Si7051 temp: %.2f\r\n", myiAQ_Core_data.pred, myiAQ_Core_data.Tvoc, myiAQ_Core_data.resistance, sgp30.eCO2,sgp30.TVOC, data.gas_resistance ,( data.temperature/100.0f ) , ( data.humidity / 1000.0f ), ( data.pressure / 100.0f ) , SiTemp ); //Real results after 5 minutes of ON time
+
+ rslt = myBME680.bme680_set_sensor_mode ( &gas_sensor ); //BME680 reset
}
-
- }
}
\ No newline at end of file
diff -r 44f7dbc5c75d -r 96de1304b9e7 mbed.bld --- a/mbed.bld Fri May 01 14:31:45 2020 +0000 +++ b/mbed.bld Fri May 29 11:28:45 2020 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/users/mbed_official/code/mbed/builds/3a7713b1edbc \ No newline at end of file +https://os.mbed.com/users/mbed_official/code/mbed/builds/65be27845400 \ No newline at end of file