Changeset 10698 for firmware/FSC

Timestamp:

05/13/11 12:39:16 (14 years ago)

Author:

neise

Message:

 

Location:

firmware/FSC/src

Files:

• FSC_eth_with_user_interface.c (modified) (4 diffs)
• w5100_spi_interface.c (modified) (4 diffs)

firmware/FSC/src/FSC_eth_with_user_interface.c

@@ -59 +59 @@
         
 for ( U08 i=0; i < (RESISTANCE_CHANNELS/8); ++i ) {
-        ad7719_enables[i]=0x00;
+        ad7719_enables[i]=0xFF;
         ad7719_channels_ready[i]=0;
         }
@@ -101 +101 @@
 
         if (check_if_adc_measurement_done()) {
-                telegram_start();
-                w5100_set_TX(adc_values, ADC_VALUES_LEN_BYTE);
-
+                
                 if(adc_print_endless){
                         usart_write_str((pU08)"V|");
                         usart_write_U32(sec ,8);
                         print_adc_nicely(false,true);
+                        telegram_start();
+                        w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
+
                         reset_voltage_done();
                 } else 
@@ -113 +114 @@
                         adc_values_printed = true;
                         print_adc_nicely(true,true);
+                        telegram_start();
+                        w5100_set_TX((U08*) adc_values, ADC_VALUES_LEN_BYTE);
+
                 }
         } 
 
         if (check_if_ad7719_measurement_done()) {
-                telegram_start();
-                w5100_set_TX(ad7719_values, AD7719_VALUES_LEN_BYTE);
 
                 if(ad7719_print_endless){
@@ -125 +127 @@
                         print_ad7719_nicely(false,true);
                         reset_resistance_done();
+                        telegram_start();
+                        w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
+
                 } else 
                 if ( !ad7719_values_printed) {
                         ad7719_values_printed = true;
                         print_ad7719_nicely(true,true);
+                        telegram_start();
+                        w5100_set_TX((U08*) ad7719_values, AD7719_VALUES_LEN_BYTE);
+
                 }
         } 

firmware/FSC/src/w5100_spi_interface.c

@@ -300 +300 @@
 // returns number of words, transmitted into TX - buffer.
 U16 w5100_set_TX(U08* string, U16 NumBytes) {
+
         U16 freesize = get_S0_TX_FSR();
         if (freesize == 0)
@@ -305 +306 @@
                 return 0;
         }
+        usart_write_str((U08*)"sending via eth: with pointer:");
+        usart_write_U16_hex(string);
+        usart_write_str((U08*)" #of bytes: ");
+        usart_write_U16(NumBytes,4 );
+        usart_write_char(' \n');
         
         U16 last_TX_write_pointer = get_S0_TX_WR();
@@ -312 +318 @@
 
         U16 upper_size, lower_size;
+        /*
         if (NumBytes > ETH_WRITE_BUFFER_SIZE)
         {
@@ -320 +327 @@
                 return 0;
         }
-        else if ( freesize < NumBytes )
+        else */
+        if ( freesize < NumBytes )
         {
                 NumBytes = freesize;