From 13f8517b2567d33d137edb0284e1d13da35ad39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Tue, 30 Jan 2018 09:09:34 +0100 Subject: [PATCH] Fix void return on BMX280 sensor (#489) --- README.md | 4 ++-- code/espurna/sensors/BMX280Sensor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8b5ada31..9028cea2 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8266 based smart switch It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries. [![version](https://img.shields.io/badge/version-1.12.3-brightgreen.svg)](CHANGELOG.md) -![branch](https://img.shields.io/badge/branch-master-orange.svg) -[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=master)](https://travis-ci.org/xoseperez/espurna) +![branch](https://img.shields.io/badge/branch-dev-orange.svg) +[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna) [![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE) [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=xose%2eperez%40gmail%2ecom&lc=US&no_note=0¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest) [![twitter](https://img.shields.io/twitter/follow/xoseperez.svg?style=social)](https://twitter.com/intent/follow?screen_name=xoseperez) diff --git a/code/espurna/sensors/BMX280Sensor.h b/code/espurna/sensors/BMX280Sensor.h index 6bd49c6f..1451ba48 100644 --- a/code/espurna/sensors/BMX280Sensor.h +++ b/code/espurna/sensors/BMX280Sensor.h @@ -341,7 +341,7 @@ class BMX280Sensor : public I2CSensor { var1 = ((var1 * var1 * (int64_t)_bmx280_calib.dig_P3)>>8) + ((var1 * (int64_t)_bmx280_calib.dig_P2)<<12); var1 = (((((int64_t)1)<<47)+var1))*((int64_t)_bmx280_calib.dig_P1)>>33; - if (var1 == 0) return; // avoid exception caused by division by zero + if (var1 == 0) return SENSOR_ERROR_I2C; // avoid exception caused by division by zero p = 1048576 - adc_P; p = (((p<<31) - var2)*3125) / var1;