Made the collect-view application that was preivously hidden inside examples/sky-shell into its own application. This makes it possible for other platforms to use the same nica Java gui from the sky-shell application.

apps/collect-view/Makefile.collect-view

@@ -0,0 +1,5 @@
+collect-view_src = collect-view.c
+
+ifeq ($(TARGET), sky)
+collect-view_src += collect-view-sky.c
+endif

apps/collect-view/collect-view-sky.c

@@ -0,0 +1,43 @@
+#include "collect-view.h"
+#include "dev/cc2420.h"
+#include "dev/leds.h"
+#include "dev/light-sensor.h"
+#include "dev/battery-sensor.h"
+#include "dev/sht11-sensor.h"
+
+enum {
+  BATTERY_VOLTAGE_SENSOR,
+  BATTERY_INDICATOR,
+  LIGHT1_SENSOR,
+  LIGHT2_SENSOR,
+  TEMP_SENSOR,
+  HUMIDITY_SENSOR,
+  RSSI_SENSOR,
+  ETX1_SENSOR,
+  ETX2_SENSOR,
+  ETX3_SENSOR,
+  ETX4_SENSOR,
+};
+
+/*---------------------------------------------------------------------------*/
+void
+collect_view_arch_read_sensors(struct collect_view_data_msg *msg)
+{
+
+  SENSORS_ACTIVATE(light_sensor);
+  SENSORS_ACTIVATE(battery_sensor);
+  SENSORS_ACTIVATE(sht11_sensor);
+
+  msg->sensors[BATTERY_VOLTAGE_SENSOR] = battery_sensor.value(0);
+  msg->sensors[BATTERY_INDICATOR] = sht11_sensor.value(SHT11_SENSOR_BATTERY_INDICATOR);
+  msg->sensors[LIGHT1_SENSOR] = light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC);
+  msg->sensors[LIGHT2_SENSOR] = light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR);
+  msg->sensors[TEMP_SENSOR] = sht11_sensor.value(SHT11_SENSOR_TEMP);
+  msg->sensors[HUMIDITY_SENSOR] = sht11_sensor.value(SHT11_SENSOR_HUMIDITY);
+
+
+  SENSORS_DEACTIVATE(light_sensor);
+  SENSORS_DEACTIVATE(battery_sensor);
+  SENSORS_DEACTIVATE(sht11_sensor);
+}
+/*---------------------------------------------------------------------------*/

apps/collect-view/collect-view.c

@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * $Id: collect-view.c,v 1.1 2010/10/12 11:37:41 adamdunkels Exp $
+ */
+
+/**
+ * \file
+ *         Collect view client code
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "contiki.h"
+#include "shell.h"
+
+#include "net/rime/collect-neighbor.h"
+
+#include "net/rime.h"
+#include "net/rime/broadcast-announcement.h"
+
+#include "net/rime/timesynch.h"
+
+#include "collect-view.h"
+
+/*---------------------------------------------------------------------------*/
+PROCESS(collect_view_data_process, "collect-view-data");
+SHELL_COMMAND(collect_view_data_command,
+	      "collect-view-data",
+	      "collect-view-data: sensor data, power consumption, network stats",
+	      &collect_view_data_process);
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(collect_view_data_process, ev, data)
+{
+  static unsigned long last_cpu, last_lpm, last_transmit, last_listen;
+  unsigned long cpu, lpm, transmit, listen;
+  struct collect_view_data_msg msg;
+  struct collect_neighbor *n;
+  PROCESS_BEGIN();
+
+
+  msg.len = sizeof(struct collect_view_data_msg) / sizeof(uint16_t);
+  msg.clock = clock_time();
+#if TIMESYNCH_CONF_ENABLED
+  msg.timesynch_time = timesynch_time();
+#else /* TIMESYNCH_CONF_ENABLED */
+  msg.timesynch_time = 0;
+#endif /* TIMESYNCH_CONF_ENABLED */
+  
+  energest_flush();
+  
+  cpu = energest_type_time(ENERGEST_TYPE_CPU) - last_cpu;
+  lpm = energest_type_time(ENERGEST_TYPE_LPM) - last_lpm;
+  transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT) - last_transmit;
+  listen = energest_type_time(ENERGEST_TYPE_LISTEN) - last_listen;
+
+  /* Make sure that the values are within 16 bits. If they are larger,
+     we scale them down to fit into 16 bits. */
+  while(cpu >= 65536ul || lpm >= 65536ul ||
+	transmit >= 65536ul || listen >= 65536ul) {
+    cpu /= 2;
+    lpm /= 2;
+    transmit /= 2;
+    listen /= 2;
+  }
+  
+  msg.cpu = cpu;
+  msg.lpm = lpm;
+  msg.transmit = transmit;
+  msg.listen = listen;
+
+  last_cpu = energest_type_time(ENERGEST_TYPE_CPU);
+  last_lpm = energest_type_time(ENERGEST_TYPE_LPM);
+  last_transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT);
+  last_listen = energest_type_time(ENERGEST_TYPE_LISTEN);
+
+  rimeaddr_copy(&msg.parent, &shell_collect_conn.parent);
+  n = collect_neighbor_list_find(&shell_collect_conn.neighbor_list,
+                                 &shell_collect_conn.parent);
+  if(n != NULL) {
+    msg.parent_etx = collect_neighbor_link_estimate(n);
+    msg.parent_rtmetric = n->rtmetric;
+  } else {
+    msg.parent_etx = 0;
+    msg.parent_rtmetric = 0;
+  }
+  msg.num_neighbors = collect_neighbor_list_num(&shell_collect_conn.neighbor_list);
+  msg.beacon_interval = broadcast_announcement_beacon_interval() / CLOCK_SECOND;
+
+  memset(msg.sensors, 0, sizeof(msg.sensors));
+  collect_view_arch_read_sensors(&msg);
+
+  shell_output(&collect_view_data_command, &msg, sizeof(msg), "", 0);
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+void
+collect_view_init(void)
+{
+  shell_register_command(&collect_view_data_command);
+}
+/*---------------------------------------------------------------------------*/

apps/collect-view/collect-view.h

@@ -0,0 +1,28 @@
+#ifndef COLLECT_VIEW_H
+#define COLLECT_VIEW_H
+
+#include "contiki-conf.h"
+#include "net/rime/rimeaddr.h"
+
+struct collect_view_data_msg {
+  uint16_t len;
+  uint16_t clock;
+  uint16_t timesynch_time;
+  uint16_t cpu;
+  uint16_t lpm;
+  uint16_t transmit;
+  uint16_t listen;
+  rimeaddr_t parent;
+  uint16_t parent_etx;
+  uint16_t parent_rtmetric;
+  uint16_t num_neighbors;
+  uint16_t beacon_interval;
+
+  uint16_t sensors[10];
+};
+
+void collect_view_init(void);
+
+void collect_view_arch_read_sensors(struct collect_view_data_msg *msg);
+
+#endif /* COLLECT_VIEW_H */