Forráskód Böngészése

Pretty printed the Arduino code with astyle

Baozhu Zuo 6 éve
szülő
commit
efc3f63abf
3 módosított fájl, 170 hozzáadás és 165 törlés
  1. 80 76
      HDC1000.cpp
  2. 48 47
      HDC1000.h
  3. 42 42
      examples/readTempHumi/readTempHumi.ino

+ 80 - 76
HDC1000.cpp

@@ -1,116 +1,120 @@
 /*
- * HDC1000.h
- * A library for HDC1000 1.0
- *
- * Copyright (c) 2015 seeed technology inc.
- * Website    : www.seeed.cc
- * Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
- * Create Time: April 2015
- * Change Log :
- *
- * The MIT License (MIT)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+    HDC1000.h
+    A library for HDC1000 1.0
+
+    Copyright (c) 2015 seeed technology inc.
+    Website    : www.seeed.cc
+    Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
+    Create Time: April 2015
+    Change Log :
+
+    The MIT License (MIT)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+*/
 
 #include "HDC1000.h"
 #include "Wire.h"
 #if defined(__avr__)
- #include <util/delay.h>
+    #include <util/delay.h>
 #endif
 
-HDC1000::HDC1000(uint8_t address, int drdyn_pin){
-	_addr = address;
+HDC1000::HDC1000(uint8_t address, int drdyn_pin) {
+    _addr = address;
     _drdyn_pin = drdyn_pin;
 
-	if(_drdyn_pin > -1) pinMode(_drdyn_pin, INPUT);
+    if (_drdyn_pin > -1) {
+        pinMode(_drdyn_pin, INPUT);
+    }
 }
 
-uint8_t HDC1000::begin(uint8_t reset, uint8_t mode, uint8_t resolution, uint8_t heater){
-	Wire.begin();
+uint8_t HDC1000::begin(uint8_t reset, uint8_t mode, uint8_t resolution, uint8_t heater) {
+    Wire.begin();
 
-	uint8_t config = mode|resolution|heater|reset;
+    uint8_t config = mode | resolution | heater | reset;
 
-	setConfig(config);
+    setConfig(config);
 
-	return config;
+    return config;
 }
 
-uint16_t HDC1000::readConfig(void){
-	setReadRegister(HDC1000_CONFIG);
+uint16_t HDC1000::readConfig(void) {
+    setReadRegister(HDC1000_CONFIG);
 
-	return read16();
+    return read16();
 }
 
-void HDC1000::setReadRegister(uint8_t reg){
-	Wire.beginTransmission(_addr);
-	Wire.write(reg);
-	Wire.endTransmission();
+void HDC1000::setReadRegister(uint8_t reg) {
+    Wire.beginTransmission(_addr);
+    Wire.write(reg);
+    Wire.endTransmission();
 
-	if(_drdyn_pin > -1) while(digitalRead(_drdyn_pin)==HIGH); //using DRDYn pin
-	else delay(20);											  //using 20ms delay instead
+    if (_drdyn_pin > -1) while (digitalRead(_drdyn_pin) == HIGH); //using DRDYn pin
+    else {
+        delay(20);    //using 20ms delay instead
+    }
 }
 
-void HDC1000::setConfig(uint8_t config){
-	Wire.beginTransmission(_addr);
-	Wire.write(HDC1000_CONFIG); 							//accessing the configuration register
-	Wire.write(config); 									//sending the config bits (MSB)
-	Wire.write(0x00); 										//the last 8 bits must be zeroes
-	Wire.endTransmission();
+void HDC1000::setConfig(uint8_t config) {
+    Wire.beginTransmission(_addr);
+    Wire.write(HDC1000_CONFIG); 							//accessing the configuration register
+    Wire.write(config); 									//sending the config bits (MSB)
+    Wire.write(0x00); 										//the last 8 bits must be zeroes
+    Wire.endTransmission();
 }
 
-uint16_t HDC1000::read16(){
-	uint8_t bytes = 2;
-	uint16_t dest = 0;
+uint16_t HDC1000::read16() {
+    uint8_t bytes = 2;
+    uint16_t dest = 0;
 
-	Wire.requestFrom(_addr, bytes);
-	if(Wire.available()>=bytes){
-		dest = Wire.read()<<8;
-		dest += Wire.read();
-	}
-	return dest;
+    Wire.requestFrom(_addr, bytes);
+    if (Wire.available() >= bytes) {
+        dest = Wire.read() << 8;
+        dest += Wire.read();
+    }
+    return dest;
 }
 
-uint16_t HDC1000::getRawTemp(void){
-	setReadRegister(HDC1000_TEMP);
+uint16_t HDC1000::getRawTemp(void) {
+    setReadRegister(HDC1000_TEMP);
 
-	return read16();
+    return read16();
 }
 
-uint16_t HDC1000::getRawHumi(void){
-	setReadRegister(HDC1000_HUMI);
+uint16_t HDC1000::getRawHumi(void) {
+    setReadRegister(HDC1000_HUMI);
 
-	return read16();
+    return read16();
 }
 
-double HDC1000::getTemp(void){
-	double temp = getRawTemp();
+double HDC1000::getTemp(void) {
+    double temp = getRawTemp();
 
-	return temp/65536.0*165.0-40.0;
+    return temp / 65536.0 * 165.0 - 40.0;
 }
 
-double HDC1000::getHumi(void){
-	double humi = getRawHumi();
+double HDC1000::getHumi(void) {
+    double humi = getRawHumi();
 
-	return humi/65536.0*100.0;
+    return humi / 65536.0 * 100.0;
 }
 
-boolean HDC1000::battery(){
-	return(bitRead(readConfig(), 11));
+boolean HDC1000::battery() {
+    return (bitRead(readConfig(), 11));
 }

+ 48 - 47
HDC1000.h

@@ -1,33 +1,33 @@
 /*
- * HDC1000.h
- * A library for HDC1000 1.0
- *
- * Copyright (c) 2015 seeed technology inc.
- * Website    : www.seeed.cc
- * Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
- * Create Time: April 2015
- * Change Log :
- *
- * The MIT License (MIT)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+    HDC1000.h
+    A library for HDC1000 1.0
+
+    Copyright (c) 2015 seeed technology inc.
+    Website    : www.seeed.cc
+    Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
+    Create Time: April 2015
+    Change Log :
+
+    The MIT License (MIT)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+*/
 
 #ifndef HDC1000_H
 #define HDC1000_H
@@ -35,9 +35,9 @@
 #include <inttypes.h>
 
 #if (ARDUINO >= 100)
- #include "Arduino.h"
+    #include "Arduino.h"
 #else
- #include "WProgram.h"
+    #include "WProgram.h"
 #endif
 
 #define HDC1000_ADDR				0x40
@@ -62,28 +62,29 @@
 #define HDC1000_HUMI_11BIT			0x01
 #define	HDC1000_HUMI_8BIT			0x02
 
-class HDC1000{
-	public: 
-		HDC1000(uint8_t address = HDC1000_ADDR, int drdyn_pin = -1);
+class HDC1000 {
+  public:
+    HDC1000(uint8_t address = HDC1000_ADDR, int drdyn_pin = -1);
 
-		uint8_t begin(uint8_t reset = HDC1000_RST, uint8_t mode = HDC1000_BOTH_TEMP_HUMI, uint8_t resolution = HDC1000_TEMP_HUMI_14BIT, uint8_t heater = HDC1000_HEAT_ON);
+    uint8_t begin(uint8_t reset = HDC1000_RST, uint8_t mode = HDC1000_BOTH_TEMP_HUMI,
+                  uint8_t resolution = HDC1000_TEMP_HUMI_14BIT, uint8_t heater = HDC1000_HEAT_ON);
 
-		boolean battery();
+    boolean battery();
 
-		uint16_t getRawTemp(void);
-		uint16_t getRawHumi(void);
+    uint16_t getRawTemp(void);
+    uint16_t getRawHumi(void);
 
-		double getTemp(void);
-		double getHumi(void);
+    double getTemp(void);
+    double getHumi(void);
 
-		uint16_t readConfig(void);
+    uint16_t readConfig(void);
 
-	private:
-  		int _drdyn_pin;
-        uint8_t _addr;
-  		uint16_t read16();
-  		void setReadRegister(uint8_t reg);
-  		void setConfig(uint8_t config);
+  private:
+    int _drdyn_pin;
+    uint8_t _addr;
+    uint16_t read16();
+    void setReadRegister(uint8_t reg);
+    void setConfig(uint8_t config);
 };
 
 #endif

+ 42 - 42
examples/readTempHumi/readTempHumi.ino

@@ -1,50 +1,50 @@
 /*
- * HDC1000.h
- * A library for HDC1000 1.0
- *
- * Copyright (c) 2015 seeed technology inc.
- * Website    : www.seeed.cc
- * Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
- * Create Time: April 2015
- * Change Log :
- *
- * The MIT License (MIT)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+    HDC1000.h
+    A library for HDC1000 1.0
+
+    Copyright (c) 2015 seeed technology inc.
+    Website    : www.seeed.cc
+    Author     : Pillar Zuo (baozhu.zuo@seeed.cc)
+    Create Time: April 2015
+    Change Log :
+
+    The MIT License (MIT)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+*/
 
 #include <Wire.h>
 #include <HDC1000.h>
- 
+
 HDC1000 mySensor;
 //HDC1000 mySensor(0x41, 2) <-- DRDYn enabled and connected to Arduino pin 2 (allows for faster measurements).
- 
-void setup(){
-	Serial.begin(9600);
-	mySensor.begin();
+
+void setup() {
+    Serial.begin(9600);
+    mySensor.begin();
 }
- 
-void loop(){
-	Serial.print("Temperature: ");
-	Serial.print(mySensor.getTemp()); 
-	Serial.print("C, Humidity: ");     
-	Serial.print(mySensor.getHumi());
-	Serial.println("%");
-	delay(1000);
+
+void loop() {
+    Serial.print("Temperature: ");
+    Serial.print(mySensor.getTemp());
+    Serial.print("C, Humidity: ");
+    Serial.print(mySensor.getHumi());
+    Serial.println("%");
+    delay(1000);
 }