Project

General

Profile

Revision 682

Added by Greg Tress about 16 years ago

Added colonet functionality, remote control driver

View differences:

trunk/code/projects/colonet/robot/joystick/joystick.c
1
#include <dragonfly_lib.h>
2
#include <wireless.h>
3
#include "../../common/colonet_defs.h"
4

  
5
#define IS_TRIGGER_DOWN(status)   (status & (1))
6
#define IS_BUTTON_DOWN(status)    (status & (1<<1))
7
#define IS_RIGHT(status)          (status & (1<<2))
8
#define IS_X_CENTER(status)       (status & (1<<3))
9
#define IS_LEFT(status)           (status & (1<<4))
10
#define IS_DOWN(status)           (status & (1<<5))
11
#define IS_Y_CENTER(status)       (status & (1<<6))
12
#define IS_UP(status)             (status & (1<<7)) 
13

  
14
#define TRIGGER_PRESSED           1
15
#define TRIGGER_RELEASED          (1<<1)
16
#define BUTTON_PRESSED            (1<<2)
17
#define BUTTON_RELEASED           (1<<3)
18
#define MOVED_LEFT                (1<<4)
19
#define MOVED_CENTER_X            (1<<5)
20
#define MOVED_RIGHT               (1<<6)
21
#define MOVED_UP                  (1<<7)
22
#define MOVED_CENTER_Y            (1<<8)
23
#define MOVED_DOWN                (1<<9)
24

  
25
int joystick_status (void);
26
int joystick_change (int old, int new);
27

  
28
int last_status = 0; 
29
int cur_status = 0;
30

  
31
int main (void) {
32
  dragonfly_init(SERIAL | USB | COMM | ORB | ANALOG);
33
	ADCSRA = 0;
34
	ADCSRA |= _BV(ADEN) | _BV(ADPS2) | _BV(ADPS1) | _BV(ADPS0);
35
	orb_set_color(BLUE);
36
  
37
  int status, change;
38
  while (1) {
39
    last_status = cur_status;
40
    cur_status = joystick_status();
41
    change = joystick_change(old_status, cur_status);
42
    if (change | TRIGGER_PRESSED)
43
      orb_set_color(GREEN);
44
    if (change | TRIGGER_RELEASED)
45
      orb_set_color(BLUE);
46
    delay_ms(100);
47
  }
48
  
49
}
50

  
51
int joystick_change (int old, int new) {
52
  int trigger_change = 0;
53
  int button_change = 0;
54
  int x_change = 0;
55
  int y_change = 0;
56
  /* Check for trigger change */
57
  if (TRIGGER_DOWN(old) && !TRIGGER_DOWN(new))
58
    trigger_change = TRIGGER_RELEASED;
59
  if (!TRIGGER_DOWN(old) && TRIGGER_DOWN(new)) 
60
    trigger_change = TRIGGER_PRESSED;
61
  /* Check for button change */
62
  if (BUTTON_DOWN(old) && !BUTTON_DOWN(new))
63
    button_change = BUTTON_RELEASED;
64
  if (!BUTTON_DOWN(old) && BUTTON_DOWN(new))
65
    button_change = BUTTON_PRESSED;
66
  /* Check for X change */
67
  if (IS_X_CENTER(old) && IS_RIGHT(new))
68
    x_change = MOVE_RIGHT;
69
  if (IS_X_CENTER(old) && IS_LEFT(new))
70
    x_change = MOVE_LEFT;
71
  if (!IS_X_CENTER(old) && IS_X_CENTER(new))
72
    x_change = MOVE_X_CENTER;
73
  /* Check for Y change */
74
  if (IS_Y_CENTER(old) && IS_UP(new))
75
    y_change = MOVE_UP;
76
  if (IS_Y_CENTER(old) && IS_DOWN(new))
77
    y_change = MOVE_DOWN;
78
  if (!IS_Y_CENTER(old) && IS_Y_CENTER(new))
79
    y_change = MOVE_Y_CENTER;
80
  return trigger_change | button_change | x_change | y_change;
81
}
82

  
83
/**
84
 * Get the current status of the joystick.
85
 * This includes the X and Y axes and the buttons.
86
 * Whenever this is called, the status is saved as part of the state.
87
 */
88
int joystick_status (void) {
89
	int trigger_status = 0;
90
	int button_status = 0;
91
  /* For x and y status, use three LSB one-hot as follows: [L|C|R] and [U|C|D] */
92
	int x_status = 0; 
93
	int y_status = 0;
94
	int xval, yval;
95
	
96
	char buf[100];
97
	
98
  /*
99
  sprintf(buf, "trigger: %d  \t button: %d \t X: %d \t Y: %d \n", 
100
    analog_get8(AN0), analog_get8(AN1),
101
    analog_get8(AN4), analog_get8(AN5));
102
  usb_puts(buf);
103
  */
104
    
105
  if (trigger_status == 0 && analog_get8(AN0) > 200) {
106
    trigger_status = 1;
107
    sprintf(buf, "Trigger pressed\n");
108
    usb_puts(buf);
109
  }
110
  if (trigger_status == 1 && analog_get8(AN0) < 100) {
111
    trigger_status = 0;
112
    sprintf(buf, "Trigger released\n");
113
    usb_puts(buf);
114
  }
115
  if (button_status == 0 && analog_get8(AN1) > 200) {
116
    button_status = 1;
117
    sprintf(buf, "Button pressed\n");
118
    usb_puts(buf);
119
  }
120
  if (button_status == 1 && analog_get8(AN1) < 100) {
121
    button_status = 0;
122
    sprintf(buf, "Button released\n");
123
    usb_puts(buf);
124
  }
125
  
126
  xval = analog_get8(AN4);
127
  yval = analog_get8(AN5);
128
  
129
  if (x_status == 0 && xval > 150) {
130
    x_status = 1<<2;
131
    sprintf(buf, "moved left\n");
132
    usb_puts(buf);
133
  }
134
  else if (x_status == 0 && xval < 75) {
135
    x_status = 1;
136
    sprintf(buf, "moved right\n");
137
    usb_puts(buf);
138
  }
139
  else if (x_status == 1 && xval > 75) {
140
    x_status = 1<<1;
141
    sprintf(buf, "centered x\n");
142
    usb_puts(buf);
143
  }
144
  else if (x_status == -1 && xval < 150) {
145
    x_status = 1<<1;
146
    sprintf(buf, "centered x\n");
147
    usb_puts(buf);
148
  }
149
  
150
  if (y_status == 0 && yval > 150) {
151
    y_status = 1<<3;
152
    sprintf(buf, "moved up\n");
153
    usb_puts(buf);
154
  }
155
  else if (y_status == 0 && yval < 75) {
156
    y_status = 1;
157
    sprintf(buf, "moved down\n");
158
    usb_puts(buf);
159
  }
160
  else if (y_status == 1 && yval > 75) {
161
    y_status = 1<<1;
162
    sprintf(buf, "centered y\n");
163
    usb_puts(buf);
164
  }
165
  else if (y_status == -1 && yval < 150) {
166
    y_status = 1<<1;
167
    sprintf(buf, "centered y\n");
168
    usb_puts(buf);
169
  }
170

  
171
  return trigger_status | (button_status << 1) | (x_status << 2) | (y_status << 5);
172
}
trunk/code/projects/colonet/robot/joystick/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 = joystick
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 = /dev/ttyUSB0
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

  
trunk/code/projects/colonet/client/Colonet.java
54 54
	JButton btnAssignID;
55 55
	boolean setWaypoint;
56 56
	int setWaypointID;
57
    JButton btnSetBounds;
58
    RobotBoundary boundary;
57
  JButton btnSetBounds;
58
  JButton btnClearBounds;
59
  RobotBoundary boundary;
59 60
	JButton btnCommand_MoveTo;
60 61
	JButton btnCommand_MoveAll;
61 62
	JButton btnCommand_StopTask;
......
218 219
		panelRobotCommands.add(new JLabel("Selected Icon: "));
219 220
		panelRobotCommands.add(lblSelected);
220 221
		panelRobotCommands.add(btnAssignID);
222
    panelRobotCommands.add(new JLabel(" "));
221 223
		panelRobotCommands.add(btnSetBounds);
224
    panelRobotCommands.add(btnClearBounds);
222 225
		panelRobotCommands.add(btnCommand_MoveTo);
223 226
		panelRobotCommands.add(btnCommand_MoveAll);
224 227
		//panelRobotCommands.add(btnCommand_StopTask);
......
278 281
		
279 282
		// Disable components before connecting
280 283
		btnConnect.setText("Connect");
281
        lblConnectionStatus.setText("Status: Disconnected");
282
        btnF.setEnabled(false);
283
        btnB.setEnabled(false);
284
        btnL.setEnabled(false);
285
        btnR.setEnabled(false);
286
        btnActivate.setEnabled(false);
287
        btnAssignID.setEnabled(false);
288
        btnSetBounds.setEnabled(false);
289
        btnCommand_MoveTo.setEnabled(false);
290
        btnCommand_MoveAll.setEnabled(false);
284
    lblConnectionStatus.setText("Status: Disconnected");
285
    btnF.setEnabled(false);
286
    btnB.setEnabled(false);
287
    btnL.setEnabled(false);
288
    btnR.setEnabled(false);
289
    btnActivate.setEnabled(false);
290
    btnAssignID.setEnabled(false);
291
    btnSetBounds.setEnabled(false);
292
    btnClearBounds.setEnabled(false);
293
    btnCommand_MoveTo.setEnabled(false);
294
    btnCommand_MoveAll.setEnabled(false);
291 295

  
292 296
		/* Add all listeners here */
293 297
		// Task Management
......
317 321
		btnConnect.addActionListener(this);
318 322
		btnGetXBeeIDs.addActionListener(this);
319 323
		btnAssignID.addActionListener(this);
320
        btnSetBounds.addActionListener(this);
324
    btnSetBounds.addActionListener(this);
325
    btnClearBounds.addActionListener(this);
321 326
		panelWebcam.addMouseListener(this);
322 327
		panelWebcam.addMouseMotionListener(this);
323 328
	}
......
385 390
	}
386 391

  
387 392
	public void connect () {
388
        if (csi != null)
389
	        return;
390
        csi = new ColonetServerInterface(self);
391
        csi.connect(txtHost.getText(), txtPort.getText());
392
        if (!csi.isReady()) {
393
	        csi = null;
394
	        return;
395
        }
396
        webcamLoader = new WebcamLoader(self);
397
        dataUpdater = new DataUpdater();
398
        dataUpdater.start();
399
        webcamLoader.start();
400
        Runnable r = new Runnable() {
401
	        public void run () {
402
		        btnConnect.setText("Disconnect");
403
		        lblConnectionStatus.setText("Status: Connected");
404
                btnF.setEnabled(true);
405
                btnB.setEnabled(true);
406
                btnL.setEnabled(true);
407
                btnR.setEnabled(true);
408
                btnActivate.setEnabled(true);
409
                btnAssignID.setEnabled(true);
410
                btnSetBounds.setEnabled(true);
411
                btnCommand_MoveTo.setEnabled(true);
412
                btnCommand_MoveAll.setEnabled(true);
413
		    }
414
		};
415
		SwingUtilities.invokeLater(r);
393
    if (csi != null)
394
      return;
395
    csi = new ColonetServerInterface(self);
396
    csi.connect(txtHost.getText(), txtPort.getText());
397
    if (!csi.isReady()) {
398
      csi = null;
399
      return;
400
    }
401
    webcamLoader = new WebcamLoader(self);
402
    dataUpdater = new DataUpdater();
403
    dataUpdater.start();
404
    webcamLoader.start();
405
    Runnable r = new Runnable() {
406
      public void run () {
407
        btnConnect.setText("Disconnect");
408
        lblConnectionStatus.setText("Status: Connected");
409
          btnF.setEnabled(true);
410
          btnB.setEnabled(true);
411
          btnL.setEnabled(true);
412
          btnR.setEnabled(true);
413
          btnActivate.setEnabled(true);
414
          btnAssignID.setEnabled(true);
415
          btnSetBounds.setEnabled(true);
416
          btnClearBounds.setEnabled(true);
417
          btnCommand_MoveTo.setEnabled(true);
418
          btnCommand_MoveAll.setEnabled(true);
419
      }
420
    };
421
    SwingUtilities.invokeLater(r);
416 422
	}
417 423

  
418 424
	public void disconnect () {
......
432 438
                btnActivate.setEnabled(false);
433 439
                btnAssignID.setEnabled(false);
434 440
                btnSetBounds.setEnabled(false);
441
                btnClearBounds.setEnabled(false);
435 442
                btnCommand_MoveTo.setEnabled(false);
436 443
                btnCommand_MoveAll.setEnabled(false);
437 444
		    }
......
538 545
		robotIcons = newList;
539 546
		repaint();
540 547
	}
548
  
549
  /**
550
    * Parses a message that indicates a robot has reached its destination
551
   */
552
  public void parseMoveUpdate (String line) {
553
    System.out.println("Got move update: " + line);
554
    String [] str = line.split(" ");
555
    int id = Integer.parseInt(str[1]);
556
    robotIcons.cancelMoveTo(id);
557
  }
541 558
	
542 559
	/**
543 560
	* Set the ID of the selected robot
......
787 804
      } else if (source == btnSetBounds) {
788 805
        boundary.set = true;
789 806
        panelWebcam.setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR));
807
      } else if (source == btnClearBounds) {
808
        boundary.active = false;
809
        boundary.set = false;
810
        boundary.img_p1 = new Point(-1, -1);
811
        boundary.img_p2 = new Point(-1, -1);
812
        boundary.panel_p1 = new Point(-1, -1);
813
        boundary.panel_p2 = new Point(-1, -1);
814
        boundary.sendToServer();
790 815
			} else if (source == btnCommand_MoveTo) {
791 816
				if (selectedBot < 0) {
792 817
					return;
......
1111 1136
    }
1112 1137
    
1113 1138
    public void sendToServer () {
1114
        if (csi != null) {
1115
            csi.sendBoundary(img_p1.x, img_p1.y, img_p2.x, img_p2.y);
1116
        }
1139
      if (csi != null) {
1140
        csi.sendBoundary(img_p1.x, img_p1.y, img_p2.x, img_p2.y);
1141
      }
1117 1142
    }
1118 1143
  }
1119 1144

  
trunk/code/projects/colonet/client/ColonetServerInterface.java
62 62
	public static final String CLIENT_ASSIGN_ROBOT_ID = "87";
63 63
  public static final String CLIENT_SET_VIRTUAL_WALL = "89";
64 64
	public static final String MOVE_TO_ABSOLUTE_POSITION = "83"; //0x53
65
	public static final String ROBOT_REPORT_ARRIVED_AT_POSITION = "93"; //0x5D
65 66

  
66 67

  
67 68
	//Queue instructions
......
542 543
			else if (line.startsWith(ColonetServerInterface.RESPONSE_TO_CLIENT_REQUEST + " " +
543 544
				ColonetServerInterface.CLIENT_REQUEST_ROBOT_POSITIONS))
544 545
				colonet.parsePositions(line);
546
      else if (line.startsWith(ColonetServerInterface.ROBOT_REPORT_ARRIVED_AT_POSITION))
547
        colonet.parseMoveUpdate(line);
545 548
			// Unknown type
546 549
			else {
547 550
				System.out.println("Got unknown data: " + line + "\n");

Also available in: Unified diff