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

Timestamp:

07/27/11 18:57:59 (13 years ago)

Author:

neise

Message:

 

File:

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

firmware/FSC/src/FSC_eth_with_user_interface.c

@@ -46 +46 @@
         U16 eth_red_bytes;
 
+        U08 rc;
+        
         app_init();               // Setup: Watchdog and I/Os
         usart_init();
@@ -62 +64 @@
         
 for ( U08 i=0; i < (RESISTANCE_CHANNELS/8); ++i ) {
-        ad7719_enables[i]=0x00;
+        ad7719_enables[i]=0xFF;
         ad7719_channels_ready[i]=0;
         }
@@ -90 +92 @@
 
         // checks if socket is okay and resets in case of problem the W5100 
-        if (w5100_caretaker())  
+        rc=w5100_caretaker();
+        if ( rc != 0x17 && rc != 0x14)  
         {
+                usart_write_str((pU08)"caretaker! error code:");
+                usart_write_U08_hex(rc);
+                usart_write_crlf();
         // something is not okay with the ethernet ... 
         // will be reset in the next revolution.. but maybe we want to do more...
@@ -99 +105 @@
         if ( (milisec % W5100_INPUT_CHECK_TIME == 0) && (w5100_ready) )
         {
-                eth_red_bytes = get_S0_RX_RSR();
-                if (eth_red_bytes != 0) { // we have something to read
+                if ( (eth_red_bytes = get_S0_RX_RSR()) != 0) {
+                        for (U08 rep=0; rep<1; ) {
+                                if (eth_red_bytes == get_S0_RX_RSR() )
+                                        rep++;
+                                else
+                                        eth_red_bytes =get_S0_RX_RSR();
+                        }
                         usart_write_str((pU08)"ethgot:");
                         usart_write_U16(eth_red_bytes, 7);
@@ -106 +117 @@
                         parse_w5300_incoming( w5100_get_RX(ETH_READ_BUFFER_SIZE, true) );
                 }
+                
         }
         
@@ -116 +128 @@
                         usart_write_U32(sec ,8);
                         print_adc_nicely(false,true);
+                        write_status_via_eth();
                         //print_adc_stupid();
                         reset_voltage_done();
                         reset_voltage_values();
-                        telegram_start();
-                        w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
+                        //telegram_start();
+                        //w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
 
                         reset_voltage_done();
@@ -127 +140 @@
                         adc_values_printed = true;
                         print_adc_nicely(true,true);
+                        write_status_via_eth();
                         //print_adc_stupid();
                         //reset_voltage_done();
-                        telegram_start();
-                        w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
+                        //telegram_start();
+                        //w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
 
                 }
@@ -138 +152 @@
 
                 if(ad7719_print_endless){
-                        usart_write_str((pU08)"R|");
-                        usart_write_U32(sec ,8);
-                        print_ad7719_nicely(false,true);
+                        
+                        print_ad7719_nicely();
+                        write_status_via_eth();
                         reset_resistance_done();
-                        telegram_start();
-                        w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
+                        reset_voltage_done();
+                        
+                        //telegram_start();
+                        //w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
 
                 } else 
@@ -149 +165 @@
                         ad7719_values_printed = true;
                         print_ad7719_nicely(true,true);
+                        write_status_via_eth();
                         reset_resistance_done();
-                        telegram_start();
-                        w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
+                        //telegram_start();
+                        //w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
 
                 }