From a3c966300ce48b3ba758170238d4a44ba0c7fecb Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 6 Jul 2015 22:38:41 +0200
Subject: o Migrating to Arduino 1.6

---
 trygvisio_soil_moisture.ino | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'trygvisio_soil_moisture.ino')

diff --git a/trygvisio_soil_moisture.ino b/trygvisio_soil_moisture.ino
index 621a64d..e524f71 100644
--- a/trygvisio_soil_moisture.ino
+++ b/trygvisio_soil_moisture.ino
@@ -2,26 +2,27 @@
 #include <SPI.h>
 #include <lib_aci.h>
 #include <aci_setup.h>
+#include <avr/sleep.h>
 
 // See config.h on how to configure the sketch
 #include "config.h"
 #include "services.h"
 #include "app.h"
 
-static services_pipe_type_mapping_t services_pipe_type_mapping[NUMBER_OF_PIPES] = SERVICES_PIPE_TYPE_MAPPING_CONTENT;
-static hal_aci_data_t setup_msgs[NB_SETUP_MESSAGES] PROGMEM = SETUP_MESSAGES_CONTENT;
+static void setup_rf();
+static void show_pipes();
 
-static struct aci_state_t aci_state;
-static hal_aci_evt_t aci_data;
-static boolean timing_change_done  = false;
+static services_pipe_type_mapping_t services_pipe_type_mapping[NUMBER_OF_PIPES] = SERVICES_PIPE_TYPE_MAPPING_CONTENT;
+static const hal_aci_data_t setup_msgs[NB_SETUP_MESSAGES] PROGMEM = SETUP_MESSAGES_CONTENT;
 
 static const uint8_t pipe_set = PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_SET;
 static const uint8_t pipe_tx = PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_TX;
 static const uint8_t pipe_rx = PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_RX_ACK_AUTO;
 static const uint8_t pipe_rx_max_size = PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_RX_ACK_AUTO_MAX_SIZE;
 
-static void setup_rf();
-static void show_pipes();
+static struct aci_state_t aci_state;
+static hal_aci_evt_t aci_data;
+static boolean timing_change_done  = false;
 
 void __ble_assert(const char *file, uint16_t line)
 {
-- 
cgit v1.2.3