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

Timestamp:

05/12/11 17:47:17 (14 years ago)

Author:

neise

Message:

 

File:

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

firmware/FSC/src/FSC_eth_with_user_interface.c

@@ -33 +33 @@
 
 // ATMEGA ADC global variables
-        U08 adc_values[VOLTAGE_CHANNELS]; // stores measured voltage in steps of 16mV
+        U08 adc_readings_until_mean=250;
+        U32 adc_values[VOLTAGE_CHANNELS]; // stores measured voltage in steps of 16mV
         U08 adc_enables[VOLTAGE_CHANNELS/8];
         U08 adc_channels_ready[VOLTAGE_CHANNELS/8];
         U08 adc_readings_since_last_muxing = 0;
         U08 adc_current_channel = 0;
-        U08 adc_current_reading = 0;
+        U16 adc_current_reading = 0;
         bool adc_measured_all = false;
         bool adc_values_printed = true;
@@ -45 +46 @@
         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    
 //-----------------------------------------------------------------------------
+/*
 int main(void)
 {
@@ -58 +63 @@
                 received_bytes = get_S0_RX_RSR();
                 
-                usart_write_U16_hex(get_S0_TX_FSR()); usart_write_char('\t'); usart_write_char('|');
-                usart_write_U16_hex(get_S0_TX_RD()); usart_write_char('\t'); usart_write_char('|');
-                usart_write_U16_hex(get_S0_TX_WR()); usart_write_char('\t'); usart_write_char('|');
-                usart_write_U16_hex(get_S0_RX_RSR()); usart_write_char('\t'); usart_write_char('|');
-                usart_write_U16_hex(get_S0_RX_RD()); usart_write_char('\t'); usart_write_char('|');
+                
                 
         
@@ -115 +116 @@
         
 } // end of main()      
-
+*/
 int main(void)
 {
@@ -141 +142 @@
         static U08 welcome[]="welcome to:\n FSC command interface 0.1 \n build: ??.05.2010\n";
         usart_write_str(welcome);
+        /*
         print_help();
         print_adc_enable_status(true);
@@ -149 +151 @@
         usart_write_U32(sec , 7);
         usart_write_str((pU08)" sec.\n");
-
+*/
 //MAIN LOOP
 while (1)
 {
-        if (w5100_caretaker())
+        // checks if socket is okay and resets in case of problem the W5100 
+        if (w5100_caretaker())  
         {
         // something is not okay with the ethernet ... 
@@ -159 +162 @@
         }
         
+        // this if should check every 25ms if we have any data on the W5100
         if ( (milisec % W5100_INPUT_CHECK_TIME == 0) && (w5100_ready) )
         {
                 if (get_S0_RX_RSR() != 0) { // we have something to read
-                        really_downloaded_bytes = w5100_get_RX(ETH_READ_BUFFER_SIZE, true);
+                        downloaded_bytes = w5100_get_RX(ETH_READ_BUFFER_SIZE, true);
+                        usart_write_str((pU08)"got ethernet stream - no. of. bytes:");
+                        usart_write_U08(downloaded_bytes,3);
+                        usart_write_char('\n');
+                        for (U08 i=0; i<downloaded_bytes; i++){
+                                usart_write_U08_hex(eth_read_buffer[i]);
+                                usart_write_char(' ');
+                        }
+                        usart_write_char('\n');
                 }
         }
@@ -170 +182 @@
                 if(adc_print_endless){
                         usart_write_str((pU08)"V|");
-                        usart_write_float((float)local_ms/1000 , 1,4);
+                        usart_write_U32(sec ,8);
                         print_adc_nicely(false,true);
-                        for ( U08 i=0; i<V_BITMAP; ++i ) {
+                        for ( U08 i=0; i<(VOLTAGE_CHANNELS/8); ++i ) {
                                 adc_channels_ready[i]=0;
                         }
@@ -185 +197 @@
                 if(ad7719_print_endless){
                         usart_write_str((pU08)"R|");
-                        usart_write_float((float)local_ms/1000 , 1,4);
+                        usart_write_U32(sec ,8);
                         print_ad7719_nicely(false,true);
-                        for ( U08 i=0; i<CHANNEL_BITMAP; ++i ) {
+                        for ( U08 i=0; i<(RESISTANCE_CHANNELS/8); ++i ) {
                                 ad7719_channels_ready[i]=0;
                         }
@@ -224 +236 @@
         if ( UCSRA & (1<<DOR) ){
                 usart_write_str((pU08)"PC sending to fast!\n");
-                usart_last_char = UDR;
+                //usart_last_char = UDR;
+                UDR;
                 // flush TX_buffer and write warning message in
                 // maybe even switch off every measurement. ?