Resolved merge conflict

BME680Setup.md

@@ -36,7 +36,14 @@ banana
 **Add here**: PIMIDORI / Adafruit
 
 Also:
+**Add here**: Download of BSEC and copy into RPI / PIMIDORI / Adafruit
+
+Also -- for another page, not here:
+- secondary I2C in my case
 - change the checkpointing interval
 - every 3 seconds
 - change 5ºC to 4ºC ??
 
+## Install Azure IoTHub Client SDK
+
+https://pypi.org/project/azure-iot-device/ and https://docs.microsoft.com/en-us/azure/iot-hub/iot-hub-devguide-sdks

DeviceSetup.md

@@ -18,4 +18,4 @@
 6. Install Vim: `sudo apt-get install vim -y` (because I prefer Vim to Vi/Nano/Emacs)
 7. Install Git: `sudo apt-get install git -y` (to get files from this and other repos)
 
-That's it. Continue with the [BME680 libraries](BME680Setup.md) I chose to use.
+That's it. Continue with the setup of [BME680 and Azure libraries](BME680Setup.md).

README.md

@@ -7,7 +7,20 @@ Bosch has a library (compiled C) to handle this sensor, including proprietary co
 
 **Note**: This project is Work in Progress as of 22/01/2020. I'm actively working on it and will be adding daily.
 
-[Basic Device Setup](DeviceSetup.md)
+## Base setup instructions
 
-[Libraries setup](BME680Setup.md)
+Start by following these instructions to set up the Zero: [Basic Device Setup](DeviceSetup.md) . If you already have one running, just remember to enable I2C. After this, you'll need to install some aditional libraries in the device, related either to the BME680 sensor or to Azure. To do this, follow the steps here: [Libraries setup](BME680Setup.md) .
 
+To-add:
+
+- Link to Adafruit and to the setup I did, maybe a photo of it with the connections
+
+## Get sensor readings and push them to Azure
+
+After the setup is done, you'll need to make make changes to make sure that:
+- the readings are captured in a format simple to process in Azure (I picked CSV, JSON would be another good option)
+- have code to send the readings to Azure IoT Hub
+
+## Process the incoming data in Azure
+
+And finally, what I'm doing in Azure, of course :)