From 0be308b7cebbcc3050659336aabb7fb1c41a99f6 Mon Sep 17 00:00:00 2001
From: zhitao <zhitao>
Date: Mon, 17 Nov 2008 16:14:09 +0000
Subject: [PATCH] changed RSSI samples count to maximum (=16)

---
 platform/msb430/dev/cc1020-internal.h | 2 +-
 platform/msb430/dev/cc1020.c          | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/platform/msb430/dev/cc1020-internal.h b/platform/msb430/dev/cc1020-internal.h
index 1ae217eb3..0b73d64f6 100644
--- a/platform/msb430/dev/cc1020-internal.h
+++ b/platform/msb430/dev/cc1020-internal.h
@@ -186,7 +186,7 @@ const uint8_t cc1020_config_115200[41] = {
   0x4C,   // 0x0F, AFC_CONTROL Ruetten 0xCC
   0x80,   // 0x10, FILTER Bandwith 500 kHz
   0x61,   // 0x11, VGA1
-  0x55,   // 0x12, VGA2
+  0x57,   // 0x12, VGA2
   0x30,   // 0x13, VGA3
   0x35,   // 0x14, VGA4
   0x20,   // 0x15, LOCK is Carrier SENSE
diff --git a/platform/msb430/dev/cc1020.c b/platform/msb430/dev/cc1020.c
index 6f23cea70..7a548c616 100644
--- a/platform/msb430/dev/cc1020.c
+++ b/platform/msb430/dev/cc1020.c
@@ -1,7 +1,7 @@
 /*
 Copyright 2006, Freie Universitaet Berlin. All rights reserved.
 
-These sources were developed at the Freie Universität Berlin, Computer
+These sources were developed at the Freie Universit�t Berlin, Computer
 Systems and Telematics group.
 
 Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@ Berlin, 2006
  * @file	cc1020.c
  * @author	FUB ScatterWeb Developers, Michael Baar, Nicolas Tsiftes
  *
- * Taken from ScatterWeb² 1.1 and modified/reformatted for Contiki 2.0
+ * Taken from ScatterWeb� 1.1 and modified/reformatted for Contiki 2.0
  **/
 
 #include <stdio.h>
@@ -474,11 +474,6 @@ interrupt(UART0RX_VECTOR) cc1020_rxhandler(void)
     } else {
       return;
     }
-    /*
-     * Update RSSI.
-     * TODO: add sampling/averaging of several RSSI to get
-     *       more reliable RSSI values.
-     */
     rssi = cc1020_read_reg(CC1020_RSS);
     CC1020_SET_OPSTATE(CC1020_RX | CC1020_RX_RECEIVING);
   } else if (cc1020_state & CC1020_RX_RECEIVING) {