Changeset 10910 for firmware/FSC/src/FSC_eth_with_user_interface.c

Timestamp:

06/05/11 17:40:00 (13 years ago)

Author:

neise

Message:

 

File:

• firmware/FSC/src/FSC_eth_with_user_interface.c (modified) (11 diffs)

firmware/FSC/src/FSC_eth_with_user_interface.c

@@ -34 +34 @@
         bool once_told_you = true;
         bool debug_mode = false;
-        
-// ETHERNET VARS
-U08 downloaded_bytes;
-
+
+        
 //-----------------------------------------------------------------------------
 //   M A I N    ---   M A I N    ---   M A I N    ---   M A I N    ---  M A I N    
@@ -43 +41 @@
 int main(void)
 {
+        U08 highbyte;
+        U08 lowbyte;
+
         app_init();               // Setup: Watchdog and I/Os
         usart_init();
@@ -59 +60 @@
         
 for ( U08 i=0; i < (RESISTANCE_CHANNELS/8); ++i ) {
-        ad7719_enables[i]=0xFF;
+        ad7719_enables[i]=0x00;
         ad7719_channels_ready[i]=0;
         }
-for ( U08 i=0; i < (VOLTAGE_CHANNELS/8); ++i ) {
-        adc_enables[i]=0x00;
+for ( U08 i=0; i < (VOLTAGE_REGS); ++i ) {
+        if (i < (VOLTAGE_REGS)-1)
+                adc_enables[i]=0xFF;
+        else
+                adc_enables[i]=0x0F;
         adc_channels_ready[i]=0;
 }
 
-        static U08 welcome[]="welcome to:\n FSC command interface 0.1 \n build: ??.05.2010\n";
+        static U08 welcome[]="FSC 0.2 \n build: 05.06.2010 - 12:57\n";
         usart_write_str(welcome);
         /*
@@ -94 +98 @@
         {
                 if (get_S0_RX_RSR() != 0) { // we have something to read
-                        downloaded_bytes = w5100_get_RX(ETH_READ_BUFFER_SIZE, true);
-                        parse_w5300_incoming( downloaded_bytes );
+                        
+                        parse_w5300_incoming( w5100_get_RX(ETH_READ_BUFFER_SIZE, true) );
                 }
         }
@@ -107 +111 @@
                         usart_write_U32(sec ,8);
                         print_adc_nicely(false,true);
+                        //print_adc_stupid();
+                        reset_voltage_done();
+                        reset_voltage_values();
                         telegram_start();
                         w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
@@ -115 +122 @@
                         adc_values_printed = true;
                         print_adc_nicely(true,true);
+                        //print_adc_stupid();
+                        //reset_voltage_done();
                         telegram_start();
                         w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
@@ -135 +144 @@
                         ad7719_values_printed = true;
                         print_ad7719_nicely(true,true);
+                        reset_resistance_done();
                         telegram_start();
                         w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
@@ -187 +197 @@
         //      -It is not allowed to send more than one command between two '\n'
         if (usart_rx_ready){ 
-                void MSR_parser();
+                //parse_ascii();
+                MSR_parser();
         }
 //----------------------------------------------------------------------------
@@ -193 +204 @@
         //IF ATmega internal ADC did finish a conversion --every 200us
         if ( (ADCSRA & (1<<ADIF)) && !adc_measured_all) {
-                *adc_current_reading = (U16)ADCL;
-                *adc_current_reading += (U16)ADCH<<8;
+                lowbyte = ADCL;
+                highbyte = ADCH;
+                ADCSRA |= 1<<ADIF;
+                *adc_current_reading = ((U16)highbyte<<8) | ((U16)lowbyte);
+                if (debug_mode) {
+                                usart_write_U16_hex(*adc_current_reading);
+                                usart_write_crlf();
+                }
+                
                 if (*adc_readings_since_last_muxing == ADC_READINGS_UNTIL_SETTLED+adc_readings_until_mean-1) {
+                        adc_values[*adc_current_channel] += *adc_current_reading;
                         adc_channels_ready[*adc_current_channel/8] |= (1<<(*adc_current_channel%8));
                         *adc_current_channel = increase_adc (*adc_current_channel);
@@ -201 +220 @@
                         Set_V_Muxer(*adc_current_channel);
                         *adc_readings_since_last_muxing = 0;
-                        _delay_ms(10);
+                        _delay_ms(10); // this is a muxer delay                 
                 }
                 else if (adc_readings_since_last_muxing >= ADC_READINGS_UNTIL_SETTLED-1) {
                         adc_values[*adc_current_channel] += *adc_current_reading;
+                        if (debug_mode) {
+                                usart_write_str((pU08)"ch:");
+                                usart_write_U08(*adc_current_channel,4);
+                                usart_write_str((pU08)" v:");
+                                usart_write_U16_hex(*adc_current_reading);
+                                usart_write_str((pU08)" sum:");
+                                usart_write_U16(adc_values[*adc_current_channel],8);
+                                usart_write_crlf();
+                        }
+
                         ++(*adc_readings_since_last_muxing);
                 }
@@ -212 +241 @@
 
         }
+        
 //----------------------------------------------------------------------------