Changeset 279

Timestamp:

10/06/2007 06:06:05 PM (4 years ago)

Author:

agr

Message:

sensor driver bug fix

File:

• nano-RK/src/drivers/platform/firefly2_2/source/ff_basic_sensor.c (modified) (4 diffs)

nano-RK/src/drivers/platform/firefly2_2/source/ff_basic_sensor.c

@@ -41 +41 @@
 
 uint8_t channel;
+uint8_t is_open;
 
 #define ADC_INIT() \
@@ -88 +89 @@
                         PORTF |= PWR_CTRL_MASK;
                         init_adc();  
+                        is_open=0;
                       return 1;
              
-            case OPEN:   
+            case OPEN:  
+                    if(is_open==1) return NRK_ERROR;
+                    is_open=1; 
                     if(opt&READ_FLAG)
                     {
@@ -116 +120 @@
              case READ:
                       count=0;
+                      if(size!=1 && size!=2) return 0;
                         if(channel!=BAT)
                         {
                               /* Conversion to 8-bit value*/
                               uint16_t val=get_adc_val();
-                              buffer[count]=val  & 0xFF;
-                              count++;
-                              buffer[count]=(val>>8)  & 0xFF;
+
+                                if(size==2)
+                                {
+                                        buffer[count]=val  & 0xFF;
+                                        count++;
+                                        buffer[count]=(val>>8)  & 0xFF;
+                                }
+
+                                if(size==1)
+                                {
+                                        buffer[count]=(val>>8)  & 0xFF;
+                                }
+
+
                         } else
                         {
                         uint16_t tmp;
                         tmp=read_voltage_status();
-                        buffer[count]=tmp & 0xFF;
-                        count++;
-                        buffer[count]=(tmp>>8) & 0xFF;
+                        if(size==2)
+                                {
+                                        buffer[count]=tmp & 0xFF;
+                                        count++;
+                                        buffer[count]=(tmp>>8) & 0xFF;
+                                }
+                        if(size==1)
+                                {
+                                        buffer[count]=(tmp>>8) & 0xFF;
+                                }
                         }
                       count++;
@@ -137 +160 @@
                         // Turn off sensor power
                         PORTF |= PWR_CTRL_MASK;
+                        is_open=0; 
                         return NRK_OK;