summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Tittelbach <bernhard@tittelbach.org>2016-06-12 20:51:49 +0200
committerBernhard Tittelbach <bernhard@tittelbach.org>2016-06-12 20:51:49 +0200
commite98bf9824d0b75c8d26c341f64df32f9aab74867 (patch)
tree59f20aab9aad08ec3199c4343eb65f1fb1695cff
parentbugfix (diff)
cosmetics
-rw-r--r--lib/bmp280.c5
-rw-r--r--lib/bmp280.h2
-rw-r--r--usb-bmp280/usb-bmp280.c5
3 files changed, 4 insertions, 8 deletions
diff --git a/lib/bmp280.c b/lib/bmp280.c
index 0519cca..bc6fb79 100644
--- a/lib/bmp280.c
+++ b/lib/bmp280.c
@@ -3,7 +3,7 @@
*
*
* Copyright (C) 2016 Bernhard Tittelbach <bernhard@tittelbach.org>
- * appreciative nod to Adafruit for writing a great example, go buy their stuff
+ * Thanks to Adafruit for writing a great example. Go buy their stuff!
*
* This file is part of spreadspace avr utils.
*
@@ -202,6 +202,3 @@ float bmp280_readAltitude(bmp280_sensor *sensor, float sealevelp)
{
return bmp280_calcAltitude(bmp280_readTempAndPressure(sensor).pressure, sealevelp);
}
-
-
-/// Helper Functions
diff --git a/lib/bmp280.h b/lib/bmp280.h
index 2bae5c3..d2d7b12 100644
--- a/lib/bmp280.h
+++ b/lib/bmp280.h
@@ -3,7 +3,7 @@
*
*
* Copyright (C) 2016 Bernhard Tittelbach <bernhard@tittelbach.org>
- * appreciative nod to Adafruit for writing a great example, go buy their stuff
+ * Thanks to Adafruit for writing a great example. Go buy their stuff!
*
* This file is part of spreadspace avr utils.
*
diff --git a/usb-bmp280/usb-bmp280.c b/usb-bmp280/usb-bmp280.c
index da9c994..13be70d 100644
--- a/usb-bmp280/usb-bmp280.c
+++ b/usb-bmp280/usb-bmp280.c
@@ -32,7 +32,6 @@
#include <LUFA/Drivers/Peripheral/SPI.h>
#include "util.h"
-#include "led.h"
#include "usbio.h"
#include "bmp280.h"
@@ -83,7 +82,6 @@ int main(void)
wdt_disable();
cpu_init();
- led_init();
usbio_init();
sei();
@@ -99,6 +97,7 @@ int main(void)
//CS High
CS_SENSOR(0,HIGHv);
CS_SENSOR(1,HIGHv);
+ //LUFA SPI
SPI_Init(BMP280_LUFA_SPIO_OPTIONS);
printf("USB-SPI-BMP280 starting");
@@ -137,6 +136,6 @@ int main(void)
usbio_task();
- _delay_ms(3000); // Pause for 5 seconds.
+ _delay_ms(3000); // Pause for 3 seconds.
}
}