From ab9cf92c1a0f1d400e7f46a346c47d952ea376cc Mon Sep 17 00:00:00 2001 From: meyma Date: Tue, 13 Feb 2007 20:12:00 +0000 Subject: Kleinere Korrekturen an Portbelegung und Maussensorcode gemacht --- Information/Hardware/Portbelegung.ods | Bin 14539 -> 14789 bytes source/AVR_Studio/Soccer/hal/board.c | 4 ++-- source/AVR_Studio/Soccer/hal/maussensor.c | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Information/Hardware/Portbelegung.ods b/Information/Hardware/Portbelegung.ods index 144705d..413b056 100644 Binary files a/Information/Hardware/Portbelegung.ods and b/Information/Hardware/Portbelegung.ods differ diff --git a/source/AVR_Studio/Soccer/hal/board.c b/source/AVR_Studio/Soccer/hal/board.c index 438973a..0731886 100755 --- a/source/AVR_Studio/Soccer/hal/board.c +++ b/source/AVR_Studio/Soccer/hal/board.c @@ -11,8 +11,8 @@ Board::Board() { DDRB = (1 << PB0) | (1 << PB1) | (1 << PB2) | (1 << PB3) | (1 << PB4) | (1 << PB5) | (1 << PB6) | (1 << PB7); PORTB = (1 << PB1); // Alle Low bis PB1 , kein Pollup - // Alle Ausgänge - DDRC = (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC3) | (1 << PC4) | (1 << PC5) | (1 << PC6) | (1 << PC7); + // Alle Ausgänge bis auf PC4/PC5 (Maussensor SDA) + DDRC = (1 << PC0) | (1 << PC1) | (1 << PC2) | (1 << PC3) | (1 << PC6) | (1 << PC7); PORTC = 0; // Alle Low, kein Pollup // Alle Ausgänge bis auf PD0+1(I2C) + 2+3(RS232) diff --git a/source/AVR_Studio/Soccer/hal/maussensor.c b/source/AVR_Studio/Soccer/hal/maussensor.c index 60121b3..2768b8e 100755 --- a/source/AVR_Studio/Soccer/hal/maussensor.c +++ b/source/AVR_Studio/Soccer/hal/maussensor.c @@ -1,6 +1,7 @@ #include "maussensor.h" -Maussensor::Maussensor(int index) { +Maussensor::Maussensor(int index) { + // Setze die Pins entsprechend dem übergebenen Index if(index == MAUSSENSOR0) { sda_pin = MAUS0_SDA; sck_pin = MAUS0_SCK; @@ -8,7 +9,10 @@ Maussensor::Maussensor(int index) { else { sda_pin = MAUS1_SDA; sck_pin = MAUS1_SCK; - } + } + + // Initialisiere den Maussensor + maus_sens_init(); } Maussensor::~Maussensor() { -- cgit v1.2.3