Revision 1457

View differences:

branches/colonetmk2/code/lib/include/libdragonfly/dragonfly_lib.h
75 75
/** @} **/ //end addtogroup
76 76

  
77 77
#include <inttypes.h>
78
#include <stdio.h>
79
#include <stdlib.h>
80 78
#include <avr/io.h>
81 79
#include <avr/interrupt.h>
82 80
#include <util/delay.h>
......
86 84
// missing from the AVR libc distribution.
87 85
#include "atomic.h"
88 86

  
89
#include <analog.h>
90
#include <dio.h>
91
#include <time.h>
92
#include <lcd.h>
93
#include <lights.h>
94
#include <motor.h>
95
#include <serial.h>
96
#include <buzzer.h>
97
#include <rangefinder.h>
98
#include <bom.h>
99
#include <encoders.h>
100
#include <move.h>
101
#include <reset.h>
102
#include <math.h>
103
#include <eeprom.h>
87
#include "analog.h"
88
#include "dio.h"
89
#include "time.h"
90
#include "lcd.h"
91
#include "lights.h"
92
#include "motor.h"
93
#include "serial.h"
94
#include "buzzer.h"
95
#include "rangefinder.h"
96
#include "bom.h"
97
#include "encoders.h"
98
#include "move.h"
99
#include "reset.h"
100
#include "math.h"
101
#include "eeprom.h"
102

  
103
#include <stddef.h>
104 104
#include <stdbool.h>
105 105

  
106 106
/** @brief shortcut for ATOMIC_BLOCK(ATOMIC_RESTORESTATE) **/
branches/colonetmk2/code/lib/include/libdragonfly/bom.h
68 68
/** @brief Compares all the values in bom_val[] and returns the index to the highest value element. **/
69 69
int bom_get_max(void);
70 70

  
71
/** @brief Computes the weighted average of all the bom readings to estimate the position and distance of another robot. **/
72
int bom_get_max10(int *dist);
73

  
71 74
/** @brief Enables the selected bom leds on a BOM1.5 **/
72 75
void bom_set_leds(int bit_field);
73 76

  
branches/colonetmk2/code/lib/include/libdragonfly/i2c.h
36 36
#ifndef _I2C_H_
37 37
#define _I2C_H_
38 38

  
39
#include <stddef.h>
40

  
41 39
/** @brief Address of slave receive handler function **/
42 40
typedef void (*fun_srecv_t)(char);
43 41

  
......
48 46
typedef char (*fun_send_t)(void);
49 47

  
50 48
int i2c_init(char addr, fun_mrecv_t master_recv, fun_srecv_t slave_recv, fun_send_t slave_send);
51
int i2c_send(char dest, char* data, size_t bytes);
49
int i2c_send(char dest, char* data, unsigned int bytes);
52 50
int i2c_request(char dest);
53 51

  
54 52
void i2c_packet_rec (char i2c_byte);
branches/colonetmk2/code/lib/include/libdragonfly/eeprom.h
10 10
 #ifndef _EEPROM_H_
11 11
 #define _EEPROM_H_
12 12
 
13
 #include <bom.h>
14
 
15 13
 #define EEPROM_ROBOT_ID_ADDR 0x10
16 14
 #define EEPROM_BOM_TYPE_ADDR 0x14
17 15
 
branches/colonetmk2/code/lib/include/libwireless/wl_basic.h
21 21
#ifndef WL_BASIC_H
22 22
#define WL_BASIC_H
23 23

  
24
#include <wireless.h>
24
#include "wireless.h"
25 25

  
26 26
/** @brief default wireless group for basic sending and receiving packets **/
27 27
#define WL_BASIC_GROUP 8

Also available in: Unified diff