Changeset 10245

Timestamp:

03/17/11 10:29:43 (14 years ago)

Author:

neise

Message:

 

File:

• firmware/FSC/src/FSC.c (modified) (5 diffs)

firmware/FSC/src/FSC.c

@@ -110 +110 @@
         ad7719_channels_ready[i]=0;
         }
-        ad7719_enables[0]=0x08;
+        ad7719_enables[0]=0x01;
 for ( U08 i=0; i<V_BITMAP + I_BITMAP; ++i ) {
-        adc_enables[i]=0x00;
+        adc_enables[i]=0xFF;
         adc_channels_ready[i]=0;
 }
-        adc_enables[V_BITMAP + I_BITMAP + H_BITMAP -1] = 0x00;
+        adc_enables[V_BITMAP + I_BITMAP + H_BITMAP -1] = 0x0F;
         adc_channels_ready[V_BITMAP + I_BITMAP + H_BITMAP -1]=0;
 
@@ -125 +125 @@
 while (1)
 {
+
+        //IF one of the ADC measured all channels, we wanted to know.
+        check_if_measured_all();
+        
+        if (ad7719_measured_all && adc_measured_all && !once_told_you)
+        {
+                adc_output_all();
+                once_told_you = true;
+        }
+//----------------------------------------------------------------------------
+
         if (heartbeat_enable) PORTB ^= (1<<PB3); // toggle Out2_spare --> heartbeat
 //----------------------------------------------------------------------------
@@ -230 +241 @@
                 }
         }
-//----------------------------------------------------------------------------
-        //IF one of the ADC measured all channels, we wanted to know.
-        check_if_measured_all();
-        
-        if (ad7719_measured_all && adc_measured_all && !once_told_you)
-        {
-                adc_output_all();
-                once_told_you = true;
-        }
+
 //----------------------------------------------------------------------------
 /*
@@ -831 +834 @@
                         break;
                 case 'e':       // ATmega internal ADC enable bitmaps may be set
-                        if ((usart_received_chars>5) &&
-                        (usart_rx_buffer[3] >= 'A' && usart_rx_buffer[3] <= 'H'))
-                        {
-                                adc_enables[usart_rx_buffer[3]-'A']=usart_rx_buffer[5];
-                                adc_channels_ready[usart_rx_buffer[3]-'A']=0x00;
-                        }
+                        usart_write_str((pU08)"\n setting ADC enable registers all");
+                        if (usart_rx_buffer[1] == '0'){
+                                usart_write_str((pU08)"OFF \n");
+                                for ( U08 i=0; i<V_BITMAP + I_BITMAP; ++i ) {
+                                adc_enables[i]=0x00;
+                                adc_channels_ready[i]=0;
+                        }
+                                adc_enables[V_BITMAP + I_BITMAP + H_BITMAP -1] = 0x00;
+                                adc_channels_ready[V_BITMAP + I_BITMAP + H_BITMAP -1]=0;
+                        } else {
+                                usart_write_str((pU08)"ON\n");
+                                for ( U08 i=0; i<V_BITMAP + I_BITMAP; ++i ) {
+                                adc_enables[i]=0xFF;
+                                adc_channels_ready[i]=0;
+                        }
+                                adc_enables[V_BITMAP + I_BITMAP + H_BITMAP -1] = 0x0F;
+                                adc_channels_ready[V_BITMAP + I_BITMAP + H_BITMAP -1]=0;
+                        }
+                        
+                        
                         break;
                 case 'h':
@@ -1013 +1030 @@
         // output:      U08 adc_values[V_CHANNELS + I_CHANNELS + H_CHANNELS];
         for (U08 i=0; i< V_CHANNELS + I_CHANNELS + H_CHANNELS;++i) {
-                if (i%8 == 0) usart_write_char('\n');
+        if (i%8 == 0) usart_write_char('\n');
+
+        if (i==0)
+                usart_write_str((pU08)"voltages:\n");
+        if (i==40)
+                usart_write_str((pU08)"currents in mV :-) :\n");
+        if (i==80)
+                usart_write_str((pU08)"humiditiesin mV :-) :\n");
+
+
+                
                 adc_output(i, adc_values[i]);
                 usart_write_str((pU08)"   ");