Changeset 543

Show
Ignore:
Timestamp:
04/25/08 18:26:26 (3 weeks ago)
Author:
agr
Message:

SAMPL sensor values adjusted

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nano-RK/projects/SAMPL/app_pkt_handlers/ff_basic_sensor_pkt.c

    r538 r543  
    1515#endif 
    1616 
    17  
     17#define TEMPERATURE_OFFSET  300 
    1818 
    1919uint16_t adxl_prev_x; 
    …… 
    6363  val=nrk_read(fd,&tmp,2); 
    6464  s.battery=(uint8_t)(tmp-100);  // subtract 1 volt to fit in 8 bits 
     65 
    6566  val=nrk_set_status(fd,SENSOR_SELECT,AUDIO_P2P); 
    66   val=nrk_read(fd,&(s.sound_level),1); 
     67  val=nrk_read(fd,&tmp,1); 
     68  if(tmp>255) tmp=255; 
     69  s.sound_level=tmp; 
     70 
    6771  val=nrk_set_status(fd,SENSOR_SELECT,LIGHT); 
    6872  val=nrk_read(fd,&(s.light),1); 
     73 
    6974  val=nrk_set_status(fd,SENSOR_SELECT,TEMP); 
    70   val=nrk_read(fd,&(s.temperature),1); 
    71  
     75  val=nrk_read(fd,&tmp,1); 
     76  if(tmp<TEMPERATURE_OFFSET) tmp=0; 
     77  else tmp-=TEMPERATURE_OFFSET; 
     78  // subtract offset and divide by 2 
     79  tmp=tmp>>1; 
     80  if(tmp>255) tmp=255; 
     81  s.temperature=tmp; 
    7282  max_delta=0; 
    7383