diff --git a/examples/z1/sensys_scanner/Makefile b/examples/z1/rssi_scanner/Makefile similarity index 100% rename from examples/z1/sensys_scanner/Makefile rename to examples/z1/rssi_scanner/Makefile diff --git a/examples/z1/sensys_scanner/ViewRSSI.java b/examples/z1/rssi_scanner/ViewRSSI.java similarity index 100% rename from examples/z1/sensys_scanner/ViewRSSI.java rename to examples/z1/rssi_scanner/ViewRSSI.java diff --git a/examples/z1/sensys_scanner/ViewRSSI3D.java b/examples/z1/rssi_scanner/ViewRSSI3D.java similarity index 100% rename from examples/z1/sensys_scanner/ViewRSSI3D.java rename to examples/z1/rssi_scanner/ViewRSSI3D.java diff --git a/examples/z1/sensys_scanner/project-conf.h b/examples/z1/rssi_scanner/project-conf.h similarity index 100% rename from examples/z1/sensys_scanner/project-conf.h rename to examples/z1/rssi_scanner/project-conf.h diff --git a/examples/z1/sensys_scanner/rssi-scanner.c b/examples/z1/rssi_scanner/rssi-scanner.c similarity index 100% rename from examples/z1/sensys_scanner/rssi-scanner.c rename to examples/z1/rssi_scanner/rssi-scanner.c diff --git a/examples/z1/sensys_scanner/.svn/all-wcprops b/examples/z1/sensys_scanner/.svn/all-wcprops deleted file mode 100644 index 53b4847ee..000000000 --- a/examples/z1/sensys_scanner/.svn/all-wcprops +++ /dev/null @@ -1,29 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 90 -/svnroot/contikiprojects/!svn/ver/212/uni-luebeck.de/interference_demo_2009/sensys_scanner -END -project-conf.h -K 25 -svn:wc:ra_dav:version-url -V 105 -/svnroot/contikiprojects/!svn/ver/212/uni-luebeck.de/interference_demo_2009/sensys_scanner/project-conf.h -END -rssi-scanner.c -K 25 -svn:wc:ra_dav:version-url -V 105 -/svnroot/contikiprojects/!svn/ver/107/uni-luebeck.de/interference_demo_2009/sensys_scanner/rssi-scanner.c -END -ViewRSSI.java -K 25 -svn:wc:ra_dav:version-url -V 104 -/svnroot/contikiprojects/!svn/ver/107/uni-luebeck.de/interference_demo_2009/sensys_scanner/ViewRSSI.java -END -Makefile -K 25 -svn:wc:ra_dav:version-url -V 99 -/svnroot/contikiprojects/!svn/ver/212/uni-luebeck.de/interference_demo_2009/sensys_scanner/Makefile -END diff --git a/examples/z1/sensys_scanner/.svn/entries b/examples/z1/sensys_scanner/.svn/entries deleted file mode 100644 index a0f5ff520..000000000 --- a/examples/z1/sensys_scanner/.svn/entries +++ /dev/null @@ -1,164 +0,0 @@ -10 - -dir -223 -https://contikiprojects.svn.sourceforge.net/svnroot/contikiprojects/uni-luebeck.de/interference_demo_2009/sensys_scanner -https://contikiprojects.svn.sourceforge.net/svnroot/contikiprojects - - - -2011-03-02T00:54:21.968589Z -212 -calbo - - - - - - - - - - - - - - -8c580c7b-aa3b-4e21-86b6-0d20d5e815df - -project-conf.h -file - - - - -2011-03-02T22:44:47.131897Z -913b06d7cb84689da586ead20218272e -2011-03-02T00:54:21.968589Z -212 -calbo -has-props - - - - - - - - - - - - - - - - - - - - -1919 - -rssi-scanner.c -file - - - - -2011-03-02T22:44:47.131897Z -f714b79fae9f42b1e28e27df090379d5 -2010-07-06T10:22:41.258196Z -107 -calbo -has-props - - - - - - - - - - - - - - - - - - - - -3188 - -ViewRSSI.java -file - - - - -2011-03-02T22:44:47.131897Z -11e5f871db316dbf78b62c1e459b9c1b -2010-07-06T10:22:41.258196Z -107 -calbo -has-props - - - - - - - - - - - - - - - - - - - - -6675 - -Makefile -file - - - - -2011-03-02T22:44:47.131897Z -f4665e07610b39e505c258ed8b56eaf8 -2011-03-02T00:54:21.968589Z -212 -calbo -has-props - - - - - - - - - - - - - - - - - - - - -508 - diff --git a/examples/z1/sensys_scanner/.svn/prop-base/Makefile.svn-base b/examples/z1/sensys_scanner/.svn/prop-base/Makefile.svn-base deleted file mode 100644 index 869ac71cf..000000000 --- a/examples/z1/sensys_scanner/.svn/prop-base/Makefile.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 14 -svn:executable -V 1 -* -END diff --git a/examples/z1/sensys_scanner/.svn/prop-base/ViewRSSI.java.svn-base b/examples/z1/sensys_scanner/.svn/prop-base/ViewRSSI.java.svn-base deleted file mode 100644 index 869ac71cf..000000000 --- a/examples/z1/sensys_scanner/.svn/prop-base/ViewRSSI.java.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 14 -svn:executable -V 1 -* -END diff --git a/examples/z1/sensys_scanner/.svn/prop-base/project-conf.h.svn-base b/examples/z1/sensys_scanner/.svn/prop-base/project-conf.h.svn-base deleted file mode 100644 index 869ac71cf..000000000 --- a/examples/z1/sensys_scanner/.svn/prop-base/project-conf.h.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 14 -svn:executable -V 1 -* -END diff --git a/examples/z1/sensys_scanner/.svn/prop-base/rssi-scanner.c.svn-base b/examples/z1/sensys_scanner/.svn/prop-base/rssi-scanner.c.svn-base deleted file mode 100644 index 869ac71cf..000000000 --- a/examples/z1/sensys_scanner/.svn/prop-base/rssi-scanner.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 14 -svn:executable -V 1 -* -END diff --git a/examples/z1/sensys_scanner/.svn/text-base/Makefile.svn-base b/examples/z1/sensys_scanner/.svn/text-base/Makefile.svn-base deleted file mode 100644 index 8ff09587f..000000000 --- a/examples/z1/sensys_scanner/.svn/text-base/Makefile.svn-base +++ /dev/null @@ -1,25 +0,0 @@ -DEFINES=PROJECT_CONF_H=\"project-conf.h\" - -# Define the target platform -ifndef TARGET -TARGET=sky -endif - -# Give a name to your project -CONTIKI = ../../../../contiki-2.x/ -CONTIKI_PROJECT = rssi-scanner - -# Compile project typing "make" -all: $(CONTIKI_PROJECT) - -# Upload project typing "make upload" -upload: $(CONTIKI_PROJECT).upload - -%.class: %.java - javac $(basename $<).java - -viewrssi: ViewRSSI.class - make login | java ViewRSSI - -# ContikiProjects: including the makefile -include ../../../Makefile.projects diff --git a/examples/z1/sensys_scanner/.svn/text-base/ViewRSSI.java.svn-base b/examples/z1/sensys_scanner/.svn/text-base/ViewRSSI.java.svn-base deleted file mode 100644 index e768594b6..000000000 --- a/examples/z1/sensys_scanner/.svn/text-base/ViewRSSI.java.svn-base +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (c) 2010, University of Luebeck, Germany. - * 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. - * - * Author: Carlo Alberto Boano , Joakim Eriksson, - * - */ - -import javax.swing.*; -import java.awt.*; -import java.io.*; - -public class ViewRSSI extends JPanel{ - // Constants - public static int TOTAL = 86; // Number of channel of 1 MHz sampled - public static int DECREASE_RSSI = 2; // How many dBm the grey RSSI falls each sample - public static int RSSI_MAX_VALUE = 100; // Maximum value obtainable from RSSI readings of CC2420. - public static int MARGIN_BOTTOM = 20; // Margin from the bottom - public static int MARGIN_RIGHT = 75; // Margin from the right - public static int MARGIN_TOP = 12; // Margin from the top - public static int INTERFERED_CHANNEL = 24; // Interfered channel - - public InputStream inputstr; - private int[] rssi = new int[TOTAL]; // Array of current Noise floor values (black line) - private int[] rssiMax = new int[TOTAL]; // Array with past Noise floor values (grey line) - - - public ViewRSSI() { - } - - public void paint(Graphics g) { - Graphics2D g2 = (Graphics2D) g; - int h = getHeight(); - int w = getWidth(); - double factor = (h - (MARGIN_BOTTOM*1.0)) / RSSI_MAX_VALUE; - double sSpacing = (w - MARGIN_RIGHT) / (TOTAL*1.0); - int sWidth = (int) (sSpacing - 1); - if (sWidth == 0) sWidth = 1; - - // Set white background in the plot - g.setColor(Color.white); - g.fillRect(0, 0, w, h); - - // Gradient example (ytics background) - GradientPaint greytowhite = new GradientPaint(w-MARGIN_RIGHT,0,Color.WHITE,w, 0,Color.lightGray, false); - g2.setPaint(greytowhite); - g2.fillRect(w-MARGIN_RIGHT, 0, w, h); - - // Draw the light grey channels from 11 to 26 - double xpos = 10; - for(int i=4;i rssiMax[i]) rssiMax[i] = rssi[i]; - else if (rssiMax[i] > 0) rssiMax[i] = rssiMax[i] - DECREASE_RSSI; - } - } catch (Exception e) { - e.printStackTrace(); /* Report error, but do not fail... */ - } - repaint(); - } - } - } - - - public static void main(String[] args) throws IOException { - JFrame win = new JFrame("RSSI Viewer"); - ViewRSSI panel; - win.setBounds(10, 10, 590, 590); - win.getContentPane().add(panel = new ViewRSSI()); - win.setVisible(true); - win.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - panel.handleInput(); - } - -} diff --git a/examples/z1/sensys_scanner/.svn/text-base/project-conf.h.svn-base b/examples/z1/sensys_scanner/.svn/text-base/project-conf.h.svn-base deleted file mode 100644 index 3f7a3e541..000000000 --- a/examples/z1/sensys_scanner/.svn/text-base/project-conf.h.svn-base +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2010, University of Luebeck, Germany - * 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. - * - */ - -#ifndef __PROJECT_CONF_H__ -#define __PROJECT_CONF_H__ - -#undef NETSTACK_CONF_MAC -#define NETSTACK_CONF_MAC nullmac_driver - -#undef NETSTACK_CONF_RDC -#define NETSTACK_CONF_RDC sicslowmac_driver - -#undef NETSTACK_MAC -#define NETSTACK_MAC nullmac_driver - -#undef NETSTACK_RDC -#define NETSTACK_RDC nullrdc_driver - -#endif /* __PROJECT_CONF_H__ */ diff --git a/examples/z1/sensys_scanner/.svn/text-base/rssi-scanner.c.svn-base b/examples/z1/sensys_scanner/.svn/text-base/rssi-scanner.c.svn-base deleted file mode 100644 index 1fd3c5cfe..000000000 --- a/examples/z1/sensys_scanner/.svn/text-base/rssi-scanner.c.svn-base +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2007, 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: rssi-scanner.c,v 1.2 2009/04/25 22:38:00 joxe Exp $ - */ - -/** - * \file - * Scanning 2.4 GHz radio frequencies using CC2420 and prints - * the values - * \author - * Joakim Eriksson, joakime@sics.se - */ - -#include "contiki.h" -#include "net/rime.h" - -#include "dev/leds.h" -#include "dev/cc2420.h" -#include "dev/cc2420_const.h" -#include "dev/spi.h" -#include - -/*---------------------------------------------------------------------------*/ -/* This assumes that the CC2420 is always on and "stable" */ -static void -set_frq(int c) -{ - int f; - // We can read even other channels with CC2420! - // Fc = 2048 + FSCTRL ; Fc = 2405 + 5(k-11) MHz, k=11,12, ... , 26 - f = c + 352; // Start from 2400 MHz to 2485 MHz, - FASTSPI_SETREG(CC2420_FSCTRL, f); - FASTSPI_STROBE(CC2420_SRXON); -} - -static void -do_rssi(void) -{ - int channel; - printf("RSSI:"); - for(channel = 0; channel <= 85; ++channel) { - set_frq(channel); - printf("%d ", cc2420_rssi() + 55); - } - printf("\n"); -} - -/*---------------------------------------------------------------------------*/ -PROCESS(scanner_process, "RSSI Scanner"); -AUTOSTART_PROCESSES(&scanner_process); -/*---------------------------------------------------------------------------*/ -PROCESS_THREAD(scanner_process, ev, data) -{ - PROCESS_BEGIN(); - /* switch mac layer off, and turn radio on */ - rime_mac->off(0); - cc2420_on(); - - while(1) { - do_rssi(); - PROCESS_PAUSE(); - } - - PROCESS_END(); -} -/*---------------------------------------------------------------------------*/ diff --git a/examples/z1/sensys_scanner/ViewRSSI.class b/examples/z1/sensys_scanner/ViewRSSI.class deleted file mode 100644 index 6bc4d11f9..000000000 Binary files a/examples/z1/sensys_scanner/ViewRSSI.class and /dev/null differ