Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / eyesIFX / eyesIFXv2 / hardware.h

diff --git a/tos/platforms/eyesIFX/eyesIFXv2/hardware.h b/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
index e07d4116090aa8b3bea4095eb616f738cd8c4057..92b29b03e68118e9645e24f20e5cd7073a511a2d 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
+++ b/tos/platforms/eyesIFX/eyesIFXv2/hardware.h
@@ -35,6 +35,12 @@
 
 #include "msp430hardware.h"
 
+// enum so components can override power saving,
+// as per TEP 112.
+enum {
+  TOS_SLEEP_NONE = MSP430_POWER_ACTIVE,
+};
+
 // LED assignments
 TOSH_ASSIGN_PIN(RED_LED, 5, 0); // Compatibility with the mica2
 TOSH_ASSIGN_PIN(GREEN_LED, 5, 1);
@@ -108,7 +114,12 @@ TOSH_ASSIGN_PIN(FLASH_CS, 1, 7);
 
 TOSH_ASSIGN_PIN(DEBUG_1, 1, 1);
 TOSH_ASSIGN_PIN(DEBUG_2, 1, 2);
-TOSH_ASSIGN_PIN(DEBUG_3, 1, 3);
+
+// Temperature sensor enable
+TOSH_ASSIGN_PIN(TEMP_EN, 5, 4);
+ 
+// USB power monitoring
+TOSH_ASSIGN_PIN(USB_POWER, 1, 3);
 
 inline void uwait(uint16_t u) 
 { 
@@ -153,6 +164,15 @@ atomic {
   TOSH_MAKE_POT_EN_OUTPUT();
 
 
+  //disable temperature sensor
+  TOSH_CLR_TEMP_EN_PIN();
+  TOSH_MAKE_TEMP_EN_OUTPUT();
+
+  // detect USB power
+  TOSH_SEL_USB_POWER_MODFUNC();
+  TOSH_MAKE_USB_POWER_INPUT();
+  
+  
  // wait 12ms for the radio to start
   uwait(1024*12);