aboutsummaryrefslogtreecommitdiff
path: root/trygvisio_soil_moisture.ino
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-08-21 16:56:06 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2015-08-21 16:56:06 +0200
commitca7436315ac9e742beddb8d95df62b7bbef6d34f (patch)
treec996306ce0e83e81f13ff49c0cfc816028850a4b /trygvisio_soil_moisture.ino
parent87fdaaabd62268936615321bc14679b3e59e286e (diff)
downloadtrygvisio_soil_moisture-ca7436315ac9e742beddb8d95df62b7bbef6d34f.tar.gz
trygvisio_soil_moisture-ca7436315ac9e742beddb8d95df62b7bbef6d34f.tar.bz2
trygvisio_soil_moisture-ca7436315ac9e742beddb8d95df62b7bbef6d34f.tar.xz
trygvisio_soil_moisture-ca7436315ac9e742beddb8d95df62b7bbef6d34f.zip
Diffstat (limited to 'trygvisio_soil_moisture.ino')
-rw-r--r--trygvisio_soil_moisture.ino17
1 files changed, 7 insertions, 10 deletions
diff --git a/trygvisio_soil_moisture.ino b/trygvisio_soil_moisture.ino
index 25baac0..929f220 100644
--- a/trygvisio_soil_moisture.ino
+++ b/trygvisio_soil_moisture.ino
@@ -7,8 +7,9 @@
#ifdef PERSISTENT_CONFIGURATION_SUPPORT
#include <EEPROM.h>
#endif
-#include <SoftwareSerial.h>
+#include <AltSoftSerial.h>
#include <SPI.h>
+
#include <lib_aci.h>
#include <aci_setup.h>
#include <aci_evts.h>
@@ -73,7 +74,7 @@ static hal_aci_evt_t aci_data;
static boolean timing_change_done = false;
void __ble_assert(const char *file, uint16_t line)
-{
+{
debug.print("ERROR ");
debug.print(file);
debug.print(": ");
@@ -84,7 +85,6 @@ void __ble_assert(const char *file, uint16_t line)
static void go_to_sleep();
-extern SoftwareSerial ss;
void setup() {
#ifdef TXLED0
// An attempt to make sure that the RX and TX LEDs are turned off when running normally.
@@ -105,11 +105,7 @@ void setup() {
if (debug.sink == DEBUG_SINK_SERIAL) {
debug.begin(115200);
} else if (debug.sink == DEBUG_SINK_SOFTWARE_SERIAL) {
- debug.begin(9600);
-
- while(true) {
- debug.println("hello debug world!");
- }
+ debug.begin(9600);
}
#if WAIT_FOR_SERIAL_BEFORE_STARING
@@ -148,7 +144,7 @@ static void setup_rf() {
// SPI_CLOCK_DIV8 = 2MHz SPI speed
// SPI_CLOCK_DIV16 = 1MHz SPI speed
-#ifdef ARDUINO_BLEND_MICRO
+#if defined(ARDUINO_BLEND_MICRO)
aci_state.aci_pins.board_name = REDBEARLAB_SHIELD_V1_1;
aci_state.aci_pins.reqn_pin = 6;
aci_state.aci_pins.rdyn_pin = 7;
@@ -163,7 +159,7 @@ static void setup_rf() {
aci_state.aci_pins.interface_is_interrupt = false;
aci_state.aci_pins.interrupt_number = 4;
-#elif ARDUINO_AVR_LEONARDO
+#elif defined(ARDUINO_AVR_LEONARDO)
// Assumes OLIMEXINO-32U4 and UEXT
aci_state.aci_pins.board_name = BOARD_DEFAULT;
aci_state.aci_pins.reqn_pin = 2;
@@ -179,6 +175,7 @@ static void setup_rf() {
aci_state.aci_pins.interface_is_interrupt = false;
// aci_state.aci_pins.interrupt_number = 4;
+#elif defined(ARDUINO_attiny)
#else
#error unknown board type
#endif