/ - Diff - Colony - Robotics Club

     #include <time.h>
     #endif
     //TODO: why is this in both this file and sensor_matrix.c?  If it is needed in both places,
     // put it in sensor_matrix.h.  This file already includes sensor_matrix.h
     #define DEFAULT_SENSOR_MATRIX_SIZE 20
     //#define DEFAULT_SENSOR_MATRIX_SIZE 20
     /*Ring States*/
     #define NONMEMBER 0
-...
      * alerting others of its location, but continues storing the
      * locations of other robots.
      **/
     //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_token_ring_leave()
+    {
     	ringState = LEAVING;
-...
     /**
      * Removes the packet group from the wireless library.
      **/
     //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_token_ring_unregister()
+    {
     	wl_unregister_packet_group(&wl_token_ring_handler);
-...
     /**
      * Called to cleanup the token ring packet group.
      **/
     //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.
     static void wl_token_ring_cleanup()
+    {
+    }
-...
      * @return a BOM reading from us to robot dest, in the range
      * 0-15, or -1 if it is unkown
      **/
     //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_token_get_my_sensor_reading(int dest)
+    {
     	return wl_token_get_sensor_reading(wl_get_xbee_id(), dest);
-...
+     *
      * @return the number of robots in the token ring
      **/
     //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_token_get_robots_in_ring(void)
+    {
     	return sensor_matrix_get_joined();
-...
      * @param robot the robot to check for whether it is in the token ring
      * @return nonzero if the robot is in the token ring, zero otherwise
      **/
     //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_token_is_robot_in_ring(int robot)
+    {
     	return sensor_matrix_get_in_ring(robot);
-...
+     *
      * @see wl_token_iterator_begin, wl_token_iterator_next
      **/
     //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_token_iterator_has_next(void)
+    {
     	return iteratorCount != -1;
-...
+     *
      * @return the number of robots in the token ring
      **/
     //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_token_get_num_robots(void)
+    {
     	return sensor_matrix_get_joined();
-...
+     *
      * @return the number of robots in the sensor matrix
      **/
     //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_token_get_matrix_size(void)
+    {
     	return sensor_matrix_get_size();

      * This function must be called before any other wl_error
      * function.
      **/
     //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_error_register(void)
+    {
     	wl_register_packet_group(&wl_error_handler);
-...
+     *
      * @see wl_error_register
      **/
     //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_error_unregister(void)
+    {
     	wl_unregister_packet_group(&wl_error_handler);
-...
+     *
      * @param str the error message to send
      **/
     //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_error_send_string(char* str)
+    {
     	wl_send_global_packet(WL_ERROR_GROUP, WL_ERROR_STRING_TYPE,

+     *
      * @see wl_get_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)
+    {
     	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
      **/
     //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)
+    {
     	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
      **/
     //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)
+    {
     	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
      **/
     //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)
+    {
     	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
      **/
     //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)
+    {
     	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
      **/
     //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,
-...
     #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);

      * @author Colony Project, CMU Robotics Club
      **/
     #include <avr/io.h>
     #include <avr/pgmspace.h>
     #include "lcd.h"
     #include "time.h"
-...
     /*
       FontLookup - a lookup table for all characters
     */
     static const unsigned char FontLookup [][5] =
     static const unsigned char FontLookup [][5] PROGMEM =
+      {
         { 0x00, 0x00, 0x00, 0x00, 0x00 },  // sp
         { 0x00, 0x00, 0x5f, 0x00, 0x00 },   // !
-...
      * Prints a character on the LCD screen. lcd_init
      * must be called before this function may be used.
+     *
      * Note: pgm_read_byte() is untested
+     *
      * @param c the character to print
+     *
      * @see lcd_init
-...
       int i;
       for (i = 0; i < 5; i++)
         lcd_putbyte(FontLookup[c-32][i]);
         lcd_putbyte(pgm_read_byte(&(FontLookup[c-32][i])));
       lcd_putbyte(0);
+    }

 .) Set Vin high for 2ms or more to turn off rangefinder
     */
     #include <avr/pgmspace.h>
     #include "rangefinder.h"
     #include "analog.h"
-...
 cm from the detector.  See the datasheet for more information.
     */
     static int IR_dist_conversion[114] = {
     static int IR_dist_conversion[114] PROGMEM = {
 ,791,751,714,681,651,623,597,574,552,531,512,494,478,462,447
       ,434,421,408,397,386,375,365,356,347,338,330,322,315,307,301,294
       ,288,282,276,270,265,260,255,250,245,241,237,232,228,224,221,217
-...
      * Transforms distance readings from logarithmic to linear scale.
      * This probably isn't the function you are looking for.
+     *
      * Note: pgm_read_word() needs additional testing
+     *
      * @param value the 8-bit analog value from rangefinder
+     *
      * @return linearized distance reading from rangefinder (integer in [101,800])
-...
       } else if(value > MAX_IR_ADC8) {
         return -1;
       } else {
         return IR_dist_conversion[value - MIN_IR_ADC8];
         return pgm_read_word(&(IR_dist_conversion[value - MIN_IR_ADC8]));
+      }
+    }

Project

General

Profile

Colony

Revision 1460