Added LED test into monitor, supporting increased LEDs on the apimote and telosb...

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1209 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/apps/monitor/monitor.c b/firmware/apps/monitor/monitor.c
index 8145f50..b6858aa 100644 (file)
--- a/firmware/apps/monitor/monitor.c
+++ b/firmware/apps/monitor/monitor.c
@@ -145,11 +145,11 @@ void monitor_handle_fn(uint8_t const app,
          debugstr("Command deprecated.");
          txdata(app,verb,1);
          break;
-               
+
        case MONITOR_SILENT:
-               silent=cmddata[0];
-               txdata(app,verb,1);
-               break;
+         silent=cmddata[0];
+         txdata(app,verb,1);
+      break;
 
        case MONITOR_CONNECTED:
          #ifdef MSP430
@@ -157,6 +157,33 @@ void monitor_handle_fn(uint8_t const app,
          #endif
          txdata(app,verb,0);
          break;
+
+       case MONITOR_LEDTEST:
+         //debugstr("Enter LEDTEST.");
+         i = 0;
+      #ifdef PLEDOUT
+       i++;
+       led_init();
+       led_on();
+       msdelay(5000);
+       led_off();
+      #endif
+      #ifdef PLED2OUT
+       i++;
+       led2_on();
+       msdelay(5000);
+       led2_off();
+      #endif
+      #ifdef PLED3OUT
+       i++;
+       led3_on();
+       msdelay(5000);
+       led3_off();
+      #endif
+      cmddata[0] = i;       //Return number of LEDs that we flashed.
+      txdata(app,verb,1);
+      break;
+
        }
 }
 

diff --git a/firmware/config.mk b/firmware/config.mk
index a59ab27..2657336 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -10,7 +10,7 @@ mcu ?= msp430f2618
 platform := apimote1
 config := monitor spi ccspi
 MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
-CFLAGS += -Duseuart1
+CFLAGS += -Duseuart1 -Dapimote
 endif
 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))

diff --git a/firmware/include/monitor.h b/firmware/include/monitor.h
index 019ae59..566c708 100644 (file)
--- a/firmware/include/monitor.h
+++ b/firmware/include/monitor.h
@@ -8,7 +8,7 @@
 
 #include "app.h"
 
-// Montir app number
+// Monitor application number
 #define MONITOR 0x00
 
 // Monitor Commands

diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index 2614ecc..4476724 100644 (file)
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -15,19 +15,25 @@
 #include <stdint.h>
 
 #ifdef MSP430
-#ifdef __MSPGCC__
-#include <msp430.h>
-#else
-#include <signal.h>
-#include <msp430.h>
-#include <iomacros.h>
-#endif
-
-void msp430_init();
-void led_init();  //deprecated
-void led_on();
-void led_off();
-void led_toggle();
+ #ifdef __MSPGCC__
+  #include <msp430.h>
+ #else
+  #include <signal.h>
+  #include <msp430.h>
+  #include <iomacros.h>
+ #endif
+
+ void msp430_init();
+ void led_init();  //deprecated
+ void led_on();
+ void led_off();
+ void led_toggle();
+ #if defined telosb || defined apimote
+  void led2_on();
+  void led2_off();
+  void led3_on();
+  void led3_off();
+ #endif
 #endif
 
 #include "config.h"