/trunk/code/lib/src/libwireless/wireless.c - Diff - Colony - Robotics Club

Revision 738

Added by Brian Coltin almost 16 years ago

Updated wireless library binaries and headers.

     /*Function Prototypes*/
     void wl_do_timeout(void);
     static void wl_do_timeout(void);
     //Note: the actual frame sent has group as the first four bits and
     //frame as the last four.
     void wl_send_packet(char group, char type, char* data, int len,
     					int dest, char options, char frame);
     static int wl_send_packet(char group, char type, char* data, int len, int dest, char options, char frame);
     /*Data Members*/
     //used to store incoming and outgoing packets
     unsigned char wl_buf[128];
     //TODO: does this need to be 128?  can it be smaller to save memory?
     //TODO: this shouldn't be hardcoded as 128.  it should be a define.
     static unsigned char wl_buf[128];
     //1 if we have timed out since we last checked, 0 otherwise.
     int wl_timeout = 0;
     static int wl_timeout = 0;
     PacketGroupHandler* wl_packet_groups[WL_MAX_PACKET_GROUPS];
     static PacketGroupHandler* wl_packet_groups[WL_MAX_PACKET_GROUPS];
     #ifndef ROBOT
     //called when we time out, or receive interrupt
     void sig_handler(int signo)
     static void sig_handler(int signo)
+    {
     	switch (signo)
+    	{
-...
     #else
     //called when the timer ticks
     void timer_handler(void)
     static void timer_handler(void)
+    {
     	wl_timeout = 1;
+    }
-...
     /**
      * Initializes the wireless library. Must be called before any
      * other function.
+     *
      * @param wl_port File descriptor for wireless port, or NULL for default.
      **/
     int wl_init()
+    {
     	int i;
       //TODO: using memset here instead of this loop, *might* be less instructions and *might* reduce code size but not sure
     	for (i = 0; i < WL_MAX_PACKET_GROUPS; i++)
     		wl_packet_groups[i] = NULL;
     	if (xbee_lib_init() == -1) {
     	  return -1;
     		return -1;
+    	}
     	//begin timeout timer
     	#ifdef ROBOT
     	#ifdef FIREFLY
     #ifdef ROBOT
     #ifdef FIREFLY
     	rtc_init(PRESCALE_DIV_256, 32, &timer_handler);
     	#else
     #else
     	rtc_init(HALF_SECOND, &timer_handler);
     	#endif
     	#else
     #endif
     #else
     	//create our timer
     	struct itimerval timer_val;
-...
     	sigemptyset(&wl_sig_act.sa_mask);
     	sigaction(SIGALRM, &wl_sig_act, 0);
     	sigaction(SIGINT, &wl_sig_act, 0);
     	#endif
     #endif
     	return 0;
+    }
-...
     void wl_terminate()
+    {
     	int i;
     	for (i = 0; i < WL_MAX_PACKET_GROUPS; i++)
     	for (i = 0; i < WL_MAX_PACKET_GROUPS; i++) {
     		if (wl_packet_groups[i] != NULL &&
     			wl_packet_groups[i]->unregister != NULL)
     			wl_packet_groups[i]->unregister != NULL) {
     			wl_packet_groups[i]->unregister();
+    		}
+    	}
     	xbee_terminate();
+    }
-...
+     *
      * @see wl_get_pan
      **/
     void wl_set_pan(int pan)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_set_pan(int pan)
+    {
     	xbee_set_pan_id(pan);
     	return xbee_set_pan_id(pan);
+    }
     /**
-...
+     *
      * @see wl_set_pan
      **/
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_get_pan(void)
+    {
     	return xbee_get_pan_id();
-...
+     *
      * @see wl_get_channel
      **/
     void wl_set_channel(int channel)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_set_channel(int channel)
+    {
     	xbee_set_channel(channel);
     	return xbee_set_channel(channel);
+    }
     /**
-...
+     *
      * @see wl_set_channel
      **/
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_get_channel(void)
+    {
     	return xbee_get_channel();
-...
+     *
      * @return the 16-bit address of the XBee module.
      **/
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_get_xbee_id()
+    {
     	return xbee_get_address();
-...
      * @param dest the 16-bit address of the XBee to send the packet to
      * @param frame the frame number to see with a TX_STATUS response
      **/
     void wl_send_robot_to_robot_global_packet(char group, char type,
     		char* data, int len, int dest, char frame)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_send_robot_to_robot_global_packet(char group, char type, char* data, int len, int dest, char frame)
+    {
     	wl_send_packet(group, type, data, len, dest,
     			XBEE_OPTIONS_BROADCAST_ALL_PANS, frame);
     	return wl_send_packet(group, type, data, len, dest, XBEE_OPTIONS_BROADCAST_ALL_PANS, frame);
+    }
     /**
-...
      * @param dest the 16-bit address of the XBee to send the packet to
      * @param frame the frame number to see with a TX_STATUS response
      **/
     void wl_send_robot_to_robot_packet(char group, char type,
     		char* data, int len, int dest, char frame)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_send_robot_to_robot_packet(char group, char type, char* data, int len, int dest, char frame)
+    {
     	wl_send_packet(group, type, data, len, dest, XBEE_OPTIONS_NONE,
     			frame);
     	return wl_send_packet(group, type, data, len, dest, XBEE_OPTIONS_NONE, frame);
+    }
     /**
-...
      * @param len the packet length in bytes
      * @param frame the frame number to see with a TX_STATUS response
      **/
     void wl_send_global_packet(char group, char type,
     		char* data, int len, char frame)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     int wl_send_global_packet(char group, char type, char* data, int len, char frame)
+    {
     	wl_send_packet(group, type, data, len, XBEE_BROADCAST,
     			XBEE_OPTIONS_BROADCAST_ALL_PANS, frame);
     	return wl_send_packet(group, type, data, len, XBEE_BROADCAST, XBEE_OPTIONS_BROADCAST_ALL_PANS, frame);
+    }
     /**
-...
      * @param len the packet length in bytes
      * @param frame the frame number to see with a TX_STATUS response
      **/
     void wl_send_pan_packet(char group, char type,
     		char* data, int len, char frame)
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     void wl_send_pan_packet(char group, char type, char* data, int len, char frame)
+    {
     	wl_send_packet(group, type, data, len, XBEE_BROADCAST,
     			XBEE_OPTIONS_NONE, frame);
-...
      * @param options the options for sending the packet
      * @param frame the frame number to see with a TX_STATUS response
      **/
     void wl_send_packet(char group, char type, char* data, int len,
     					int dest, char options, char frame)
     int wl_send_packet(char group, char type, char* data, int len, int dest, char options, char frame)
+    {
       //TODO: does this need to be 128?  can it be smaller to save memory?
       //TODO: this shouldn't be hardcoded as 128.  it should be a define.
     	char buf[128];
     	int i;
     	if (frame != 0)
     		frame = (frame & 0x0F) | ((group & 0x0F) << 4);
     	buf[0] = group;
     	buf[1] = type;
     	for (i = 0; i < len; i++)
     		buf[2 + i] = data[i];
     	xbee_send_packet(buf, len + 2, dest, options, frame);
     	return xbee_send_packet(buf, len + 2, dest, options, frame);
+    }
     /**
-...
     		int group = (int)(wl_buf[1] >> 4);
     		int success = 0;
     		if (wl_buf[2] == 0)
+    		{
     			success = 1;
+    		}
     		else
+    		{
     			WL_DEBUG_PRINT("No response received.\r\n");
-...
+    			}
+    		}
     		if (wl_packet_groups[group] != NULL &&
     					wl_packet_groups[group]->handle_response != NULL)
     			wl_packet_groups[group]->handle_response(
     					(int)wl_buf[1] & 0x0F, success);
     		return;
     		if (wl_packet_groups[group] != NULL && wl_packet_groups[group]->handle_response != NULL)
     			wl_packet_groups[group]->handle_response((int)wl_buf[1] & 0x0F, success);
+    	}
     	if (wl_buf[0] == XBEE_RX)
     	else if (wl_buf[0] == XBEE_RX)
+    	{
         //TODO: what does this 7 represent?  It shouldn't be hardcoded.  It should be set as a define
     		if (len < 7)
+    		{
     			WL_DEBUG_PRINT("Packet is too small.\r\n");
-...
     		int options = wl_buf[4];
     		*/
         //TODO: these indices, etc should be defined, not hardcoded
     		int group = wl_buf[5];
     		int type = wl_buf[6];
     		int packetLen = len - 7;
     		if (wl_packet_groups[group] != NULL
     				&& wl_packet_groups[group]->handle_receive != NULL)
     			wl_packet_groups[group]->handle_receive(type, source,
     				wl_buf + 7, packetLen);
     		return;
     		if (wl_packet_groups[group] != NULL && wl_packet_groups[group]->handle_receive != NULL) {
     			wl_packet_groups[group]->handle_receive(type, source, wl_buf + 7, packetLen);
+    		}
+    	}
     	WL_DEBUG_PRINT("Unexpected packet received from XBee.\r\n");
     	return;
     	else
+    	{
     		WL_DEBUG_PRINT("Unexpected packet received from XBee.\r\n");
+    	}
+    }
     #ifndef ROBOT
     //TODO: this function is so simple, it *may* be beneficial to inline this function.  testing of if
     // it reduces code size or not should be done to be sure.
     void wl_set_com_port(char* port)
+    {
     	xbee_set_com_port(port);

Also available in: Unified diff

Project

General

Profile

Colony

Revision 738