Pr/70 (#77)

* Changed wording in the readme to air quality estimate
New address of Timelab
ESP32?

* i2c dev update

* type casting

* type casts

Author: kavers1

README.adoc

@@ -3,7 +3,7 @@
 
 image::https://api.travis-ci.org/timelab/ADEM.svg[alt="Build Status", link="https://travis-ci.org/timelab/ADEM", align="left", float]
 
-The http://www.timelab.org/[Timelab] ADEM project enables cyclists to measure particulate matter (PM~1~ and PM~2.5~). The quality based on these measurements are displayed on the device, temporarily stored and sent via WiFi to a central data collection service.
+The http://www.timelab.org/[Timelab] ADEM project enables cyclists to measure particulate matter (PM~1~ and PM~2.5~). The air quality estimate based on these measurements is displayed on the device, temporarily stored and sent via WiFi to a central data collection service.
 
 The aim of this project is to create a low-cost open-source DIY hardware and firmware kit that is modular and adjustable, can be locally reproduced and repaired.
 

adem/libraries/I2Cdev/I2Cdev.cpp

@@ -100,6 +100,7 @@ I2Cdev::I2Cdev() {
  * @param timeout Optional read timeout in milliseconds (0 to disable, leave off to use default class value in I2Cdev::readTimeout)
  * @return Status of read operation (true = success)
  */
+
 int8_t I2Cdev::readBit(uint8_t devAddr, uint8_t regAddr, uint8_t bitNum, uint8_t *data, uint16_t timeout) {
     uint8_t b;
     uint8_t count = readByte(devAddr, regAddr, &b, timeout);
@@ -224,12 +225,13 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
             // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length; k += min(length, BUFFER_LENGTH)) {
+           
+            for (uint8_t k = 0; k < length; k += min((int)length, BUFFER_LENGTH)) {
                 Wire.beginTransmission(devAddr);
                 Wire.send(regAddr);
                 Wire.endTransmission();
                 Wire.beginTransmission(devAddr);
-                Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
+                Wire.requestFrom(devAddr, (uint8_t)min((int)length - k, BUFFER_LENGTH));
 
                 for (; Wire.available() && (timeout == 0 || millis() - t1 < timeout); count++) {
                     data[count] = Wire.receive();
@@ -248,15 +250,15 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
             // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length; k += min(length, BUFFER_LENGTH)) {
+            for (uint8_t k = 0; k < length; k += min((int)length, BUFFER_LENGTH)) {
                 Wire.beginTransmission(devAddr);
                 Wire.write(regAddr);
                 Wire.endTransmission();
                 for(int retry_cnt=0; retry_cnt < MAX_RETRY; retry_cnt++)
                 {
                     Wire.beginTransmission(devAddr);
-                    uint8_t receive_cnt = Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
-                    if (receive_cnt == (uint8_t)min(length - k, BUFFER_LENGTH)){
+                    uint8_t receive_cnt = Wire.requestFrom(devAddr, (uint8_t)min((int)length - k, BUFFER_LENGTH));
+                    if (receive_cnt == (uint8_t)min((int)length - k, BUFFER_LENGTH)){
                         for (; Wire.available() && (timeout == 0 || millis() - t1 < timeout); count++) {
                             data[count] = Wire.read();
                             #ifdef I2CDEV_SERIAL_DEBUG
@@ -292,14 +294,14 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                     Wire.write(regAddr);
                     Wire.endTransmission();
 //                    Wire.beginTransmission(devAddr);
-                    uint8_t receive_cnt = Wire.requestFrom(devAddr, (uint8_t)min(length - k, BUFFER_LENGTH));
+                    uint8_t receive_cnt = Wire.requestFrom(devAddr, (uint8_t)min((int)length - k, BUFFER_LENGTH));
                     #ifdef I2CDEV_SERIAL_DEBUG
                     Serial.print("received ");
                     Serial.print(receive_cnt);
                     Serial.print(" of ");
                     Serial.print(length);
                     #endif
-                    if (receive_cnt >= (uint8_t)min(length - k, BUFFER_LENGTH)){
+                    if (receive_cnt >= (uint8_t)min((int)length - k, BUFFER_LENGTH)){
                         #ifdef I2CDEV_SERIAL_DEBUG
                         Serial.print(" read data ");
                         #endif
@@ -382,7 +384,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
             // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
+            for (uint8_t k = 0; k < length * 2; k += min((int)length * 2, BUFFER_LENGTH)) {
                 Wire.beginTransmission(devAddr);
                 Wire.send(regAddr);
                 Wire.endTransmission();
@@ -415,7 +417,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
             // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
+            for (uint8_t k = 0; k < length * 2; k += min((int)length * 2, BUFFER_LENGTH)) {
                 Wire.beginTransmission(devAddr);
                 Wire.write(regAddr);
                 Wire.endTransmission();
@@ -448,7 +450,7 @@ int8_t I2Cdev::readWords(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint1
             // I2C/TWI subsystem uses internal buffer that breaks with large data requests
             // so if user requests more than BUFFER_LENGTH bytes, we have to do it in
             // smaller chunks instead of all at once
-            for (uint8_t k = 0; k < length * 2; k += min(length * 2, BUFFER_LENGTH)) {
+            for (uint8_t k = 0; k < length * 2; k += min((int)length * 2, BUFFER_LENGTH)) {
                 Wire.beginTransmission(devAddr);
                 Wire.write(regAddr);
                 Wire.endTransmission();

adem/libraries/accelero_MPU6050/accelero_MPU6050.cpp

@@ -175,16 +175,16 @@ void MPU6050Sensor::read() {
 bool MPU6050Sensor::isMoving()
 {
     long now = measuredData._timestamp;
-    if ((now - _movingTimestamp) > notmovingDelay) 
+    if ((now - (long) _movingTimestamp) > notmovingDelay) 
         return false;
     else
-        if (now > _movingTimestamp)
+        if (now > (long) _movingTimestamp)
             return true;
         else // we have wrapped around (can it happen ?)
         {
             // quick and dirty fix. 
             // if we wrapped around assume lastmoving = now
-            _movingTimestamp = now;
+            _movingTimestamp = (unsigned long)now;
         }
 }
 

docs/01-getting-started.adoc

@@ -13,7 +13,7 @@ Project contact::
 
 ....
 Timelab vzw
-Brusselsepoortstraat 97
+Kogelstraat 34
 9000 Gent, Belgium
 Telephone: +32 9 391 96 10
 Email: [email protected]

docs/0a-questions-and-answers.adoc

@@ -66,3 +66,7 @@ We already established that sensor-records will be stored in memory in binary fo
 This ensures efficient use of scarce memory, while retaining augmented information to the back-end.
 
 image::http://timelab.github.io/ADEM-Logos/svg/adem_logo-txt_stroke.svg[alt="ADEM logo", link="http://ik-adem.be/", align="right", float]
+
+== Will the project make use of the newer and faster ESP32 ?
+
+The ESP8266 has its limits. We have ran into problems with the amount of RAM and the available number of I/O pins. In the current stage of the project we are using a secondary processor (AVR) as a serial-to-I2C bridge for the GPS. This could probably be eliminated when switching to ESP32.