Project

General

Profile

Revision 105

Recharging code for the robots now compiles. It is entirely untested.

View differences:

branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/wl_recharge_group.c
14 14
void wl_recharge_cleanup(void);
15 15

  
16 16
// messgae handlers
17
void wl_recharge_station_available(int source);
17
void wl_recharge_available_station(int source);
18 18
void wl_recharge_request_accepted(int source);
19 19
void wl_recharge_verify(int source);
20 20
void wl_recharge_cancel(int source);
......
51 51

  
52 52
//global varaibles
53 53
//state variables
54
int state = NOT_RECHARGING;
54
int recharge_state = NOT_RECHARGING;
55 55
int station = -1;
56 56

  
57 57
//counter variables
......
88 88
 **/
89 89
void wl_recharge_begin(void)
90 90
{
91
	state = POLLING;
91
	recharge_state = POLLING;
92 92
	station = -1;
93 93
	pollCount = 0;
94 94
}
......
100 100
 **/
101 101
void wl_recharge_stop()
102 102
{
103
	state = NOT_RECHARGING;
103
	recharge_state = NOT_RECHARGING;
104 104
}
105 105

  
106 106
/**
......
109 109
 **/
110 110
void wl_recharge_dock(void)
111 111
{
112
	if (state != SEEKING)
112
	if (recharge_state != SEEKING)
113 113
	{
114 114
		WL_DEBUG_PRINT("Unexpected docking occurred.\n");
115 115
		return;
116 116
	}
117 117

  
118
	state = DOCKED;
118
	recharge_state = DOCKED;
119 119
}
120 120

  
121 121
/**
......
124 124
 **/
125 125
void wl_recharge_depart(void)
126 126
{
127
	if (state != DOCKED)
127
	if (recharge_state != DOCKED)
128 128
	{
129 129
		WL_DEBUG_PRINT("Unexpected departure occurred.\n");
130 130
		return;
131 131
	}
132 132
	
133
	state = DEPARTING;
133
	recharge_state = DEPARTING;
134 134
}
135 135

  
136 136
/**
......
142 142
 **/
143 143
int wl_recharge_get_state(void)
144 144
{
145
	return state;
145
	return recharge_state;
146 146
}
147 147

  
148 148
/**
......
162 162
 **/
163 163
void wl_recharge_send_poll(void)
164 164
{
165
	wl_send_global_packet(RECHARGE_GROUP, WL_RECHARGE_POLL_STATIONS,
165
	wl_send_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_POLL_STATIONS,
166 166
				NULL, 0, 0);
167 167
}
168 168

  
......
173 173
 **/
174 174
void wl_recharge_send_request(int dest)
175 175
{
176
	wl_send_robot_to_robot_global_packet(RECHARGE_GROUP, WL_RECHARGE_REQUEST,
176
	wl_send_robot_to_robot_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_REQUEST,
177 177
				NULL, 0, dest, REQUEST_FRAME);
178 178
}
179 179

  
......
185 185
 **/
186 186
void wl_recharge_send_verify(int dest)
187 187
{
188
	wl_send_robot_to_robot_global_packet(RECHARGE_GROUP, WL_RECHARGE_VERIFY,
188
	wl_send_robot_to_robot_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_VERIFY,
189 189
				NULL, 0, dest, VERIFY_FRAME);
190 190
}
191 191

  
......
195 195
 **/
196 196
void wl_recharge_send_cancel(int dest)
197 197
{
198
	wl_send_robot_to_robot_global_packet(RECHARGE_GROUP, WL_RECHARGE_CANCEL,
198
	wl_send_robot_to_robot_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_CANCEL,
199 199
				NULL, 0, dest, CANCEL_FRAME);
200 200
}
201 201

  
......
207 207
 **/
208 208
void wl_recharge_send_seeking(int dest)
209 209
{
210
	wl_send_robot_to_robot_global_packet(RECHARGE_GROUP, WL_RECHARGE_SEEKING,
210
	wl_send_robot_to_robot_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_SEEKING,
211 211
				NULL, 0, dest, SEEKING_FRAME);
212 212
}
213 213

  
......
219 219
 **/
220 220
void wl_recharge_send_docked(int dest)
221 221
{
222
	wl_send_robot_to_robot_global_packet(RECHARGE_GROUP, WL_RECHARGE_DOCKED,
222
	wl_send_robot_to_robot_global_packet(WL_RECHARGE_GROUP, WL_RECHARGE_DOCKED,
223 223
				NULL, 0, dest, DOCKED_FRAME);
224 224
}
225 225

  
......
236 236
 **/
237 237
void wl_recharge_timeout_handler(void)
238 238
{
239
	switch (state)
239
	switch (recharge_state)
240 240
	{
241 241
		case POLLING:
242 242
			if (pollCount <= 0)
......
252 252
			{
253 253
				//request failed
254 254
				station = -1;
255
				state = POLLING;
255
				recharge_state = POLLING;
256 256
				break;
257 257
			}
258 258
			requestCount--;
......
263 263
			{
264 264
				//station is down
265 265
				station = -1;
266
				state = POLLING;
266
				recharge_state = POLLING;
267 267
				break;
268 268
			}
269 269
			if (verifyCount % VERIFY_FREQUENCY == 0 && verifyCount != VERIFY_DELAY)
......
322 322
		case WL_RECHARGE_STATION_AVAILABLE:
323 323
			wl_recharge_available_station(source);
324 324
			break;
325
		case WL_RECHRAGE_REQUEST:
325
		case WL_RECHARGE_REQUEST:
326 326
			WL_DEBUG_PRINT("Only stations should receive WL_RECHARGE_REQUEST.\n");
327 327
			break;
328 328
		case WL_RECHARGE_REQUEST_ACCEPT:
......
354 354
 **/
355 355
void wl_recharge_available_station(int source)
356 356
{
357
	if (state != POLLING)
357
	if (recharge_state != POLLING)
358 358
		return;
359 359
	station = source;
360
	state = REQUESTING;
360
	recharge_state = REQUESTING;
361 361
	requestCount = REQUEST_DELAY;
362 362
	wl_recharge_send_request(station);
363 363
}
......
370 370
 **/
371 371
void wl_recharge_request_accepted(int source)
372 372
{
373
	if (state != REQUESTING)
373
	if (recharge_state != REQUESTING)
374 374
	{
375 375
		WL_DEBUG_PRINT("Accepted when we weren't requesting.\n");
376 376
		return;
......
381 381
		return;
382 382
	}
383 383

  
384
	state = SEEKING;
384
	recharge_state = SEEKING;
385 385
	verifyCount = VERIFY_DELAY;
386 386
}
387 387

  
......
400 400
		return;
401 401
	}
402 402
	
403
	switch (state)
403
	switch (recharge_state)
404 404
	{
405 405
		case SEEKING:
406 406
			wl_recharge_send_seeking(station);
......
430 430
	}
431 431

  
432 432
	verifyCount = VERIFY_DELAY;
433
	switch (state)
433
	switch (recharge_state)
434 434
	{
435 435
		case REQUESTING:
436 436
			station = -1;
437
			state = POLLING;
437
			recharge_state = POLLING;
438 438
			break;
439 439
		case SEEKING:
440 440
			station = -1;
441
			state = POLLING;
441
			recharge_state = POLLING;
442 442
			break;
443 443
		case DOCKED:
444 444
			WL_DEBUG_PRINT("Charging station kicked us out.\n");
......
469 469
	}
470 470
	
471 471
	verifyCount = VERIFY_DELAY;
472
	switch (state)
472
	switch (recharge_state)
473 473
	{
474 474
		case SEEKING:
475 475
			break;
......
499 499
	}
500 500
	
501 501
	verifyCount = VERIFY_DELAY;
502
	switch (state)
502
	switch (recharge_state)
503 503
	{
504 504
		case DOCKED:
505 505
		case DEPARTING:
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/recharge.c
20 20
void recharge_init(void)
21 21
{
22 22
	wl_recharge_register();
23
	recharge_i2c_init();
23 24
}
24 25

  
25 26
/**
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/recharge_i2c.h
1

  
2

  
3
void recharge_i2c_init(void);
4

  
5
int recharge_i2c_get_homing_reading(void);
6
int recharge_i2c_is_battery_full(void);
7
int recharge_i2c_is_battery_charging(void);
8

  
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/main.c
1
#include <dragonfly_lib.h>
2

  
3
int main(void)
4
{
5
	dragonfly_init(ALL_ON);
6
	return 0;
7
}
8

  
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/seeking.c
1 1
#include "seeking.h"
2 2

  
3 3
#include <move.h>
4
#include <serial.h>
4 5

  
6
#include "recharge_i2c.h"
7
#include "recharge_defs.h"
8

  
5 9
#include <wl_token_ring.h>
6 10

  
7 11
#define SEEK_WITH_BOM 1
......
22 26
int seek_station_with_bom(int station);
23 27
int seek_station_with_homing_sensor(void);
24 28

  
25
int state = SEEK_WITH_BOM;
29
int seeking_state = SEEK_WITH_BOM;
26 30

  
27 31
void seek_station(int station)
28 32
{
29
	if (state == SEEK_WITH_BOM)
30
		state = seek_station_with_bom(station);
33
	if (seeking_state == SEEK_WITH_BOM)
34
		seeking_state = seek_station_with_bom(station);
31 35
	else
32
		state = seek_station_with_homing_sensor();
36
		seeking_state = seek_station_with_homing_sensor();
33 37
}
34 38

  
35 39
int seek_station_with_bom(int station)
......
55 59
		move_avoid(v, w, 5);
56 60
	}
57 61

  
58
	//TODO: redesign i2c to make this cleaner and not use globals
59
	if(i2c_homing_sensor_data_dirty == I2C_DATA_DIRTY)
60
		return SEEK_WITH_BOM;
61
	
62 62
	//data is fresh, use it
63
	int widthcount = i2c_homing_sensor_data;
64
	i2c_homing_sensor_data_dirty = I2C_DATA_DIRTY;
63
	int widthcount = recharge_i2c_get_homing_reading();
65 64
	
66 65
	if(widthcount>= 4)
67 66
		return SEEK_WITH_HOMING;
......
70 69

  
71 70
int seek_station_with_homing_sensor(void)
72 71
{
73
	//if you have no new data, just continue on our current path
74
	if(i2c_homing_sensor_data_dirty == I2C_DATA_DIRTY)
75
		return SEEK_WITH_HOMING;
76
	
77 72
	//TODO: create function in homing.h to return LEFT, FORWARD, RIGHT, or NONE
78
	int widthcount = i2c_homing_sensor_data;
79
	i2c_homing_sensor_data_dirty = I2C_DATA_DIRTY;
73
	int widthcount = recharge_i2c_get_homing_reading();
80 74

  
81 75
	if (widthcount < LEFT_LOW) //can't use beacon, switch to BOM
82 76
		return SEEK_WITH_BOM;
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/recharge_defs.h
1
#define RECHARGE_DEBUG
2

  
3
#ifdef RECHARGE_DEBUG
4
#define RECHARGE_DEBUG_PRINT( s ) usb_puts( s )
5
#define RECHARGE_DEBUG_PUTI( i ) usb_puti( i )
6
#else
7
#define RECHARGE_DEBUG_PRINT( s )
8
#define RECHARGE_DEBUG_PUTI( i )
9
#endif
10

  
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/Makefile
1
########Update This Section########
2
#
3
#
4

  
5
# Relative path to the root directory (containing lib directory)
6
ifndef COLONYROOT
7
COLONYROOT = ../../../..
8
endif
9

  
10
# Target file name (without extension).
11
TARGET = template
12

  
13
# Uncomment this to use the wireless library
14
 USE_WIRELESS = 1
15

  
16
# com1 = serial port. Use lpt1 to connect to parallel port.
17
AVRDUDE_PORT = com4
18
#
19
#
20
###################################
21

  
22
# Hey Emacs, this is a -*- makefile -*-
23
#----------------------------------------------------------------------------
24
# WinAVR Makefile Template written by Eric B. Weddington, J?rg Wunsch, et al.
25
#
26
# Released to the Public Domain
27
#
28
# Additional material for this makefile was written by:
29
# Peter Fleury
30
# Tim Henigan
31
# Colin O'Flynn
32
# Reiner Patommel
33
# Markus Pfaff
34
# Sander Pool
35
# Frederik Rouleau
36
#
37
#----------------------------------------------------------------------------
38
# On command line:
39
#
40
# make all = Make software.
41
#
42
# make clean = Clean out built project files.
43
#
44
# make coff = Convert ELF to AVR COFF.
45
#
46
# make extcoff = Convert ELF to AVR Extended COFF.
47
#
48
# make program = Download the hex file to the device, using avrdude.
49
#                Please customize the avrdude settings below first!
50
#
51
# make debug = Start either simulavr or avarice as specified for debugging, 
52
#              with avr-gdb or avr-insight as the front end for debugging.
53
#
54
# make filename.s = Just compile filename.c into the assembler code only.
55
#
56
# make filename.i = Create a preprocessed source file for use in submitting
57
#                   bug reports to the GCC project.
58
#
59
# To rebuild project do "make clean" then "make all".
60
#----------------------------------------------------------------------------
61

  
62
#if you want your code to work on the Firefly++ and not Firefly+
63
#then add the -DFFPP line to CDEFS
64
CDEFS = 
65
#-DFFPP
66

  
67
# MCU name
68
MCU = atmega128
69

  
70
# Processor frequency.
71
#     This will define a symbol, F_CPU, in all source code files equal to the 
72
#     processor frequency. You can then use this symbol in your source code to 
73
#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
74
#     automatically to create a 32-bit value in your source code.
75
F_CPU = 8000000
76

  
77
# Output format. (can be srec, ihex, binary)
78
FORMAT = ihex
79

  
80
# List C source files here. (C dependencies are automatically generated.)
81
SRC = $(wildcard *.c)
82

  
83
# List Assembler source files here.
84
#     Make them always end in a capital .S.  Files ending in a lowercase .s
85
#     will not be considered source files but generated files (assembler
86
#     output from the compiler), and will be deleted upon "make clean"!
87
#     Even though the DOS/Win* filesystem matches both .s and .S the same,
88
#     it will preserve the spelling of the filenames, and gcc itself does
89
#     care about how the name is spelled on its command-line.
90
ASRC = 
91

  
92
# Optimization level, can be [0, 1, 2, 3, s]. 
93
#     0 = turn off optimization. s = optimize for size.
94
#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
95
OPT = s
96

  
97
# Debugging format.
98
#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
99
#     AVR Studio 4.10 requires dwarf-2.
100
#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
101
DEBUG =
102

  
103
# Compiler flag to set the C Standard level.
104
#     c89   = "ANSI" C
105
#     gnu89 = c89 plus GCC extensions
106
#     c99   = ISO C99 standard (not yet fully implemented)
107
#     gnu99 = c99 plus GCC extensions
108
CSTANDARD = -std=gnu99
109

  
110
# Place -D or -U options here
111
CDEFS += -DF_CPU=$(F_CPU)UL 
112
CDEFS += -DFFP
113
# for wireless library
114
ifdef USE_WIRELESS
115
	CDEFS += -DROBOT
116
endif
117

  
118
# Place -I, -L options here
119
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly 
120
CINCS += -L$(COLONYROOT)/code/lib/bin
121
ifdef USE_WIRELESS
122
	CINCS += -I$(COLONYROOT)/code/lib/include/libwireless
123
endif
124

  
125
#---------------- Compiler Options ----------------
126
#  -g*:          generate debugging information
127
#  -O*:          optimization level
128
#  -f...:        tuning, see GCC manual and avr-libc documentation
129
#  -Wall...:     warning level
130
#  -Wa,...:      tell GCC to pass this to the assembler.
131
#    -adhlns...: create assembler listing
132
CFLAGS =
133
# CFLAGS = -g$(DEBUG)
134
CFLAGS += $(CDEFS) $(CINCS)
135
CFLAGS += -O$(OPT)
136
CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
137
CFLAGS += -Wall -Wstrict-prototypes
138
CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
139
CFLAGS += $(CSTANDARD)
140

  
141
#---------------- Assembler Options ----------------
142
#  -Wa,...:   tell GCC to pass this to the assembler.
143
#  -ahlms:    create listing
144
#  -gstabs:   have the assembler create line number information; note that
145
#             for use in COFF files, additional information about filenames
146
#             and function names needs to be present in the assembler source
147
#             files -- see avr-libc docs [FIXME: not yet described there]
148
ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
149

  
150

  
151
#---------------- Library Options ----------------
152
# Minimalistic printf version
153
PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
154

  
155
# Floating point printf version (requires MATH_LIB = -lm below)
156
PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
157

  
158
# If this is left blank, then it will use the Standard printf version.
159
PRINTF_LIB = 
160
#PRINTF_LIB = $(PRINTF_LIB_MIN)
161
#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
162

  
163

  
164
# Minimalistic scanf version
165
SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
166

  
167
# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
168
SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
169

  
170
# If this is left blank, then it will use the Standard scanf version.
171
SCANF_LIB = 
172
#SCANF_LIB = $(SCANF_LIB_MIN)
173
#SCANF_LIB = $(SCANF_LIB_FLOAT)
174

  
175
MATH_LIB = -lm
176

  
177
#---------------- External Memory Options ----------------
178

  
179
# 64 KB of external RAM, starting after internal RAM (ATmega128!),
180
# used for variables (.data/.bss) and heap (malloc()).
181
#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
182

  
183
# 64 KB of external RAM, starting after internal RAM (ATmega128!),
184
# only used for heap (malloc()).
185
#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff
186

  
187
EXTMEMOPTS =
188

  
189
#---------------- Linker Options ----------------
190
#  -Wl,...:     tell GCC to pass this to linker.
191
#    -Map:      create map file
192
#    --cref:    add cross reference to  map file
193
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
194
LDFLAGS += $(EXTMEMOPTS)
195
LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
196
ifdef USE_WIRELESS
197
	LDFLAGS += -lwireless
198
endif
199
LDFLAGS += -ldragonfly
200

  
201

  
202

  
203
#---------------- Programming Options (avrdude) ----------------
204

  
205
# Programming hardware: alf avr910 avrisp bascom bsd 
206
# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500
207
#
208
# Type: avrdude -c ?
209
# to get a full listing.
210
#
211
AVRDUDE_PROGRAMMER = avrisp
212

  
213
# programmer connected to serial device
214

  
215
AVRDUDE_WRITE_FLASH = -b 57600 -U flash:w:$(TARGET).hex
216
#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
217

  
218

  
219
# Uncomment the following if you want avrdude's erase cycle counter.
220
# Note that this counter needs to be initialized first using -Yn,
221
# see avrdude manual.
222
#AVRDUDE_ERASE_COUNTER = -y
223

  
224
# Uncomment the following if you do /not/ wish a verification to be
225
# performed after programming the device.
226
#AVRDUDE_NO_VERIFY = -V
227

  
228
# Increase verbosity level.  Please use this when submitting bug
229
# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> 
230
# to submit bug reports.
231
#AVRDUDE_VERBOSE = -v -v
232

  
233
AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
234
AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
235
AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
236
AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
237

  
238
#don't check for device signature
239
AVRDUDE_FLAGS += -F
240

  
241

  
242

  
243
#---------------- Debugging Options ----------------
244

  
245
# For simulavr only - target MCU frequency.
246
DEBUG_MFREQ = $(F_CPU)
247

  
248
# Set the DEBUG_UI to either gdb or insight.
249
# DEBUG_UI = gdb
250
DEBUG_UI = insight
251

  
252
# Set the debugging back-end to either avarice, simulavr.
253
DEBUG_BACKEND = avarice
254
#DEBUG_BACKEND = simulavr
255

  
256
# GDB Init Filename.
257
GDBINIT_FILE = __avr_gdbinit
258

  
259
# When using avarice settings for the JTAG
260
JTAG_DEV = /dev/com1
261

  
262
# Debugging port used to communicate between GDB / avarice / simulavr.
263
DEBUG_PORT = 4242
264

  
265
# Debugging host used to communicate between GDB / avarice / simulavr, normally
266
#     just set to localhost unless doing some sort of crazy debugging when 
267
#     avarice is running on a different computer.
268
DEBUG_HOST = localhost
269

  
270

  
271

  
272
#============================================================================
273

  
274

  
275
# Define programs and commands.
276
SHELL = sh
277
CC = avr-gcc
278
OBJCOPY = avr-objcopy
279
OBJDUMP = avr-objdump
280
SIZE = avr-size
281
NM = avr-nm
282
AVRDUDE = avrdude
283
REMOVE = rm -f
284
REMOVEDIR = rm -rf
285
COPY = cp
286
WINSHELL = cmd
287

  
288

  
289
# Define Messages
290
# English
291
MSG_ERRORS_NONE = Errors: none
292
MSG_BEGIN = -------- begin --------
293
MSG_END = --------  end  --------
294
MSG_SIZE_BEFORE = Size before: 
295
MSG_SIZE_AFTER = Size after:
296
MSG_COFF = Converting to AVR COFF:
297
MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
298
MSG_FLASH = Creating load file for Flash:
299
MSG_EEPROM = Creating load file for EEPROM:
300
MSG_EXTENDED_LISTING = Creating Extended Listing:
301
MSG_SYMBOL_TABLE = Creating Symbol Table:
302
MSG_LINKING = Linking:
303
MSG_COMPILING = Compiling:
304
MSG_ASSEMBLING = Assembling:
305
MSG_CLEANING = Cleaning project:
306

  
307

  
308

  
309

  
310
# Define all object files.
311
OBJ = $(SRC:.c=.o) $(ASRC:.S=.o) 
312

  
313
# Define all listing files.
314
LST = $(SRC:.c=.lst) $(ASRC:.S=.lst) 
315

  
316

  
317
# Compiler flags to generate dependency files.
318
GENDEPFLAGS = -MD -MP -MF .dep/$(@F).d
319

  
320

  
321
# Combine all necessary flags and optional flags.
322
# Add target processor to flags.
323
ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
324
ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
325

  
326

  
327

  
328

  
329

  
330
# Default target.
331
all: begin gccversion sizebefore build sizeafter end
332

  
333
build: elf hex eep lss sym
334

  
335
elf: $(TARGET).elf
336
hex: $(TARGET).hex
337
eep: $(TARGET).eep
338
lss: $(TARGET).lss 
339
sym: $(TARGET).sym
340

  
341

  
342

  
343
# Eye candy.
344
# AVR Studio 3.x does not check make's exit code but relies on
345
# the following magic strings to be generated by the compile job.
346
begin:
347
	@echo
348
	@echo $(MSG_BEGIN)
349

  
350
end:
351
	@echo $(MSG_END)
352
	@echo
353

  
354

  
355
# Display size of file.
356
HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
357
ELFSIZE = $(SIZE) -A $(TARGET).elf
358
AVRMEM = avr-mem.sh $(TARGET).elf $(MCU)
359

  
360
sizebefore:
361
	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
362
	$(AVRMEM) 2>/dev/null; echo; fi
363

  
364
sizeafter:
365
	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
366
	$(AVRMEM) 2>/dev/null; echo; fi
367

  
368

  
369

  
370
# Display compiler version information.
371
gccversion : 
372
	@$(CC) --version
373

  
374

  
375

  
376
# Program the device.  
377
program: $(TARGET).hex $(TARGET).eep
378
	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
379

  
380

  
381
# Generate avr-gdb config/init file which does the following:
382
#     define the reset signal, load the target file, connect to target, and set 
383
#     a breakpoint at main().
384
gdb-config: 
385
	@$(REMOVE) $(GDBINIT_FILE)
386
	@echo define reset >> $(GDBINIT_FILE)
387
	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
388
	@echo end >> $(GDBINIT_FILE)
389
	@echo file $(TARGET).elf >> $(GDBINIT_FILE)
390
	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)
391
ifeq ($(DEBUG_BACKEND),simulavr)
392
	@echo load  >> $(GDBINIT_FILE)
393
endif	
394
	@echo break main >> $(GDBINIT_FILE)
395
	
396
debug: gdb-config $(TARGET).elf
397
ifeq ($(DEBUG_BACKEND), avarice)
398
	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
399
	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
400
	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
401
	@$(WINSHELL) /c pause
402
	
403
else
404
	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
405
	$(DEBUG_MFREQ) --port $(DEBUG_PORT)
406
endif
407
	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
408
	
409

  
410

  
411

  
412
# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
413
COFFCONVERT=$(OBJCOPY) --debugging \
414
--change-section-address .data-0x800000 \
415
--change-section-address .bss-0x800000 \
416
--change-section-address .noinit-0x800000 \
417
--change-section-address .eeprom-0x810000 
418

  
419

  
420
coff: $(TARGET).elf
421
	@echo
422
	@echo $(MSG_COFF) $(TARGET).cof
423
	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
424

  
425

  
426
extcoff: $(TARGET).elf
427
	@echo
428
	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
429
	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
430

  
431

  
432

  
433
# Create final output files (.hex, .eep) from ELF output file.
434
%.hex: %.elf
435
	@echo
436
	@echo $(MSG_FLASH) $@
437
	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
438

  
439
%.eep: %.elf
440
	@echo
441
	@echo $(MSG_EEPROM) $@
442
	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
443
	--change-section-lma .eeprom=0 -O $(FORMAT) $< $@
444

  
445
# Create extended listing file from ELF output file.
446
%.lss: %.elf
447
	@echo
448
	@echo $(MSG_EXTENDED_LISTING) $@
449
	$(OBJDUMP) -h -S $< > $@
450

  
451
# Create a symbol table from ELF output file.
452
%.sym: %.elf
453
	@echo
454
	@echo $(MSG_SYMBOL_TABLE) $@
455
	$(NM) -n $< > $@
456

  
457

  
458

  
459
# Link: create ELF output file from object files.
460
.SECONDARY : $(TARGET).elf
461
.PRECIOUS : $(OBJ)
462
%.elf: $(OBJ)
463
	@echo
464
	@echo $(MSG_LINKING) $@
465
	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
466

  
467

  
468
# Compile: create object files from C source files.
469
%.o : %.c
470
	@echo
471
	@echo $(MSG_COMPILING) $<
472
	$(CC) -c $(ALL_CFLAGS) $< -o $@ 
473

  
474

  
475
# Compile: create assembler files from C source files.
476
%.s : %.c
477
	$(CC) -S $(ALL_CFLAGS) $< -o $@
478

  
479

  
480
# Assemble: create object files from assembler source files.
481
%.o : %.S
482
	@echo
483
	@echo $(MSG_ASSEMBLING) $<
484
	$(CC) -c $(ALL_ASFLAGS) $< -o $@
485

  
486
# Create preprocessed source for use in sending a bug report.
487
%.i : %.c
488
	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ 
489

  
490

  
491
# Target: clean project.
492
clean: begin clean_list end
493

  
494
clean_list :
495
	@echo
496
	@echo $(MSG_CLEANING)
497
	$(REMOVE) $(TARGET).hex
498
	$(REMOVE) $(TARGET).eep
499
	$(REMOVE) $(TARGET).cof
500
	$(REMOVE) $(TARGET).elf
501
	$(REMOVE) $(TARGET).map
502
	$(REMOVE) $(TARGET).sym
503
	$(REMOVE) $(TARGET).lss
504
	$(REMOVE) $(OBJ)
505
	$(REMOVE) $(LST)
506
	$(REMOVE) $(SRC:.c=.s)
507
	$(REMOVE) $(SRC:.c=.d)
508
	$(REMOVEDIR) .dep
509

  
510

  
511

  
512
# Include the dependency files.
513
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
514

  
515

  
516
# Listing of phony targets.
517
.PHONY : all begin finish end sizebefore sizeafter gccversion \
518
build elf hex eep lss sym coff extcoff \
519
clean clean_list program debug gdb-config
520

  
branches/autonomous_recharging/code/projects/autonomous_recharging/dragonfly/recharge_i2c.c
1
#include "recharge_i2c.h"
2

  
3
#include <i2c.h>
4

  
5
// definitions for I2C messages
6
#define I2C_MSG_ACKNOWLEDGE       'A'
7
#define I2C_MSG_BATTERY_CHARGING  'C'
8
#define I2C_MSG_DATA              'D'
9
#define I2C_MSG_CONTACT_ERROR     'E'
10
#define I2C_MSG_BATTERY_FULL      'F'
11
#define I2C_MSG_HOMING_DATA       'H'
12
#define I2C_MSG_NO_CONTACT        'N'
13
#define I2C_MSG_REQUEST_DATA      'R'
14
#define I2C_MSG_GO_TO_SLEEP       'Y'
15
#define I2C_MSG_ENTERING_SLEEP    'Z'
16

  
17
// function prototypes
18
void recharge_i2c_receive(char i2c_byte);
19

  
20
// global variables
21
char recharge_i2c_prev_byte = 0;
22
char recharge_i2c_homing_sensor_data = 0;
23
char recharge_i2c_battery_full = 0;
24
char recharge_i2c_battery_charging = 0;
25

  
26
void recharge_i2c_init()
27
{
28
	i2c_init(1, NULL, recharge_i2c_receive, NULL);
29
}
30

  
31
/**
32
 * Returns the latest reading from the homing sensor.
33
 *
34
 * @return the latest reading from the homing sensor
35
 **/
36
int recharge_i2c_get_homing_reading()
37
{
38
	return (int)recharge_i2c_homing_sensor_data;
39
}
40

  
41
int recharge_i2c_is_battery_full()
42
{
43
	return recharge_i2c_battery_full;
44
}
45

  
46
int recharge_i2c_is_battery_charging()
47
{
48
	return recharge_i2c_battery_charging;
49
}
50

  
51
/**
52
 * Called when we receive a byte through i2c.
53
 *
54
 * @param c the byte we receive
55
 **/
56
void recharge_i2c_receive(char i2c_byte)
57
{
58
	if(recharge_i2c_prev_byte == I2C_MSG_HOMING_DATA)
59
	{
60
		recharge_i2c_homing_sensor_data = i2c_byte;
61
		recharge_i2c_prev_byte = i2c_byte;
62
		return;
63
	}
64

  
65
	switch(i2c_byte)
66
	{
67
		case I2C_MSG_BATTERY_CHARGING:
68
			recharge_i2c_battery_charging = 1;
69
			break;
70
		case I2C_MSG_CONTACT_ERROR:
71
			recharge_i2c_battery_charging = 0;
72
			break;
73
		case I2C_MSG_BATTERY_FULL:
74
			recharge_i2c_battery_full = 1;
75
			break;
76
		case I2C_MSG_NO_CONTACT:
77
			recharge_i2c_battery_charging = 0;
78
			break;
79
		default:
80
			break;
81
	}
82
	recharge_i2c_prev_byte = i2c_byte;
83
}
84

  

Also available in: Unified diff