[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250 HplTda5250ConfigC.nc, 1.1.2.4, 1.1.2.5 HplTda5250ConfigP.nc, 1.1.2.5, 1.1.2.6 Tda5250ActiveMessageP.nc, 1.1.2.4, 1.1.2.5 tda5250_message.h, 1.1.2.4, 1.1.2.5

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11833/tos/chips/tda5250

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplTda5250ConfigC.nc HplTda5250ConfigP.nc 
	Tda5250ActiveMessageP.nc tda5250_message.h 
Log Message:
- added Andreas Koepke's improvements and fixes to the tda5250 and /lib/byte_radio
- improved unconnected ASKNFSK pin handling/wireing on eyes

Index: HplTda5250ConfigC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/HplTda5250ConfigC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** HplTda5250ConfigC.nc	31 May 2006 13:53:02 -0000	1.1.2.4
--- HplTda5250ConfigC.nc	12 Sep 2006 12:16:31 -0000	1.1.2.5
***************
*** 77,80 ****
--- 77,81 ----
    HplTda5250ConfigP.ADC -> Tda5250RegistersC.ADC;
  
+   HplTda5250ConfigP.ASKNFSK -> Tda5250RadioIOC.Tda5250RadioPASKNFSK;
    HplTda5250ConfigP.PWDDD -> Tda5250RadioIOC.Tda5250RadioPWDDD;
    HplTda5250ConfigP.TXRX -> Tda5250RadioIOC.Tda5250RadioTXRX;

Index: HplTda5250ConfigP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/HplTda5250ConfigP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** HplTda5250ConfigP.nc	3 Aug 2006 18:17:52 -0000	1.1.2.5
--- HplTda5250ConfigP.nc	12 Sep 2006 12:16:31 -0000	1.1.2.6
***************
*** 61,64 ****
--- 61,65 ----
      interface Tda5250ReadReg<TDA5250_REG_TYPE_ADC>          as ADC;
  
+     interface GeneralIO as ASKNFSK;
      interface GeneralIO as TXRX;
      interface GeneralIO as PWDDD;
***************
*** 181,186 ****
      }
      else {
!       // ***** For Platforms that have a connection to the FSK pin *******
!       //call FSK.set(); 
      }
      call FSK.set(((uint16_t)((((uint16_t)pos_shift) << 8) + neg_shift)));
--- 182,186 ----
      }
      else {
!       call ASKNFSK.clr(); 
      }
      call FSK.set(((uint16_t)((((uint16_t)pos_shift) << 8) + neg_shift)));
***************
*** 193,198 ****
      } 
      else {
!       // ***** For Platforms that have a connection to the FSK pin *******
!       //call FSK.set(); 
      }
      call FSK.set((((uint16_t)value) << 8));
--- 193,197 ----
      } 
      else {
!       call ASKNFSK.set(); 
      }
      call FSK.set((((uint16_t)value) << 8));

Index: Tda5250ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/Tda5250ActiveMessageP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Tda5250ActiveMessageP.nc	4 Aug 2006 11:20:37 -0000	1.1.2.4
--- Tda5250ActiveMessageP.nc	12 Sep 2006 12:16:31 -0000	1.1.2.5
***************
*** 69,73 ****
      header->dest = addr;
      header->src = call amAddress();
-     header->group = TOS_AM_GROUP;
      return call SubSend.send(msg, len);
    }
--- 69,72 ----

Index: tda5250_message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/tda5250_message.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** tda5250_message.h	4 Aug 2006 11:20:37 -0000	1.1.2.4
--- tda5250_message.h	12 Sep 2006 12:16:31 -0000	1.1.2.5
***************
*** 3,13 ****
  
  #include "AM.h"
  
  typedef nx_struct tda5250_header_t {
    nx_am_addr_t src;
    nx_am_addr_t dest;
!   nx_uint8_t length;
!   nx_am_group_t group;
!   nx_am_id_t type;
  } tda5250_header_t;
  
--- 3,14 ----
  
  #include "AM.h"
+ #include "PacketAck.h"
  
  typedef nx_struct tda5250_header_t {
+   nx_uint8_t   length;
    nx_am_addr_t src;
    nx_am_addr_t dest;
!   nx_am_id_t   type;
!   nx_uint8_t   token;
  } tda5250_header_t;