From ec2a18e931cdaa6c62a8843c29dc93c4a823a2cd Mon Sep 17 00:00:00 2001 From: masterm Date: Mon, 19 Feb 2007 22:02:01 +0000 Subject: +++ corrected svn cripplement --- source/Concept/Framework/modules/input/distance_sensor.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source/Concept/Framework/modules/input') diff --git a/source/Concept/Framework/modules/input/distance_sensor.c b/source/Concept/Framework/modules/input/distance_sensor.c index 508eeed..262d35f 100755 --- a/source/Concept/Framework/modules/input/distance_sensor.c +++ b/source/Concept/Framework/modules/input/distance_sensor.c @@ -12,12 +12,8 @@ float Distance_Sensor::GetDistance() *hardwarePort &= ~pin;//Deactivate port *hardwareDDR &= ~pin;//Set pin input - //(parent->GetModule(IO_DISPLAY_MAIN))->Print("pre 1", 4, 1); - //Wait for response - for(int i=0;(!(PINC & pin))&&(i < 1000);i++) {asm volatile("nop");} - - //(parent->GetModule(IO_DISPLAY_MAIN))->Print("pre 2", 4, 1); + for(uint16 i = 0; (!(*hardwarePin & pin)) && (i < 1000); i++) { asm volatile("nop"); } //Calculate duration of response while((*hardwarePin & pin)&&(result < 300000)) @@ -26,7 +22,5 @@ float Distance_Sensor::GetDistance() asm volatile("nop"); } - //(parent->GetModule(IO_DISPLAY_MAIN))->Print("pre 3", 4, 1); - return (float(result) * DISTANCE_PER_VALUE); } -- cgit v1.2.3