Project

General

Profile

Revision 230b1b7f

ID230b1b7f35e612800658eedf212a43cec186e60d

Added by Thomas Mullins about 12 years ago

Fixed compiler errors in scout_avr

View differences:

scout_avr/src/range.cpp
30 30 
  unsigned int value; // last measured range
31 31 
} range[2];
32 32 

  		




  33
  
  
    
unsigned int range;


  		




  34
  
  
    

  		




  35
  33
  
    
static void on_edge(int which)


  		




  36
  34
  
    
{


  		




  37
  35
  
    
  unsigned int time = TCNT1;


  		




  ......




  66
  64
  
    
  // CS1 = 2, 1/8 prescaler


  		




  67
  65
  
    
  TCCR1B = _BV(CS11);


  		




  68
  66
  
    
  


  		




  69
  
  
    
  range = -1;


  		




  
  67
  
    
  range[0].value = RANGE_ERR;


  		




  
  68
  
    
  range[1].value = RANGE_ERR;


  		




  70
  69
  
    
}


  		




  71
  70
  
    

  		




  72
  71
  
    
unsigned int range_get(int which)


  		




  ......




  79
  78
  
    
    sei();


  		




  80
  79
  
    
    return ret;


  		




  81
  80
  
    
  }


  		




  82
  
  
    
  else return 0xFFFF;


  		




  
  81
  
    
  else return RANGE_ERR;


  		




  83
  82
  
    
}


  		












Also available in:  Unified diff