Changeset 10911 for firmware/FSC/src

Timestamp:

06/05/11 18:37:23 (13 years ago)

Author:

neise

Message:

atmega thinks it receives 512 bytes all the time ... 
thats not true ... 

Location:

firmware/FSC/src

Files:

• FSC_eth_with_user_interface.c (modified) (3 diffs)
• parser.c (modified) (5 diffs)
• w5100_spi_interface.c (modified) (6 diffs)

firmware/FSC/src/FSC_eth_with_user_interface.c

@@ -43 +43 @@
         U08 highbyte;
         U08 lowbyte;
+        
+        U16 eth_red_bytes;
 
         app_init();               // Setup: Watchdog and I/Os
@@ -71 +73 @@
 }
 
-        static U08 welcome[]="FSC 0.2 \n build: 05.06.2010 - 12:57\n";
+        static U08 welcome[]="FSC 0.2 \n build: 05.06.2010\n";
         usart_write_str(welcome);
         /*
@@ -97 +99 @@
         if ( (milisec % W5100_INPUT_CHECK_TIME == 0) && (w5100_ready) )
         {
-                if (get_S0_RX_RSR() != 0) { // we have something to read
-                        
+                eth_red_bytes = get_S0_RX_RSR();
+                if (eth_red_bytes != 0) { // we have something to read
+                        usart_write_str((pU08)"ethgot:");
+                        usart_write_U16(eth_red_bytes, 7);
+                        usart_write_crlf();
                         parse_w5300_incoming( w5100_get_RX(ETH_READ_BUFFER_SIZE, true) );
                 }

firmware/FSC/src/parser.c

@@ -315 +315 @@
 void parse_w5300_incoming( U08 bytes_in_w5100_rx_buffer ) {
 
+        usart_writeln_str((pU08)"parsget:");
+        for (U08 i =0; i< ETH_READ_BUFFER_SIZE ; i++) {
+                usart_write_U08_hex(eth_read_buffer[i]);
+                usart_write_char((U08)eth_read_buffer[i]);
+                
+        }
+        usart_write_crlf();
+
         if (bytes_in_w5100_rx_buffer == 0) // it was stupid to call this parser without having any bytes downloaded
                 return;
@@ -329 +337 @@
                         
                 case 't':       // measure *t*emperature (resistance) channels only
+                        ad7719_values_printed = false;
                         reset_resistance_done();
                         simple_acknowledge();
@@ -334 +343 @@
                         
                 case 'v':       // measure *v*oltage channels only
+                        adc_values_printed = false;
                         reset_voltage_done();
                         simple_acknowledge();
@@ -349 +359 @@
                         break;
                         
+                case 'k':
+                        eth_write_stuff();
+                        break;
+                
                 case 'z':       // re*z*et ATmega32 and peripherals
                         eth_write_buffer[0]='!';
@@ -475 +489 @@
 
 }
+
+void eth_write_stuff(void) {
+        S08 buf []="Test Ah Alarm!!\n";
+        for (U08 i =0 ; i<7 ; i++) {
+                eth_write_str(buf);                             
+        }
+}

firmware/FSC/src/w5100_spi_interface.c

@@ -217 +217 @@
 U08 high_byte = (value>>8);
 U08 low_byte = value&0x00FF;
+w5100_write(S0_TX_WR1, low_byte);
 w5100_write(S0_TX_WR0, high_byte);
-w5100_write(S0_TX_WR1, low_byte);
+
 }
 
@@ -279 +280 @@
         w5100_write ( S0_CR, CR_RECV );
         
+        /*
         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('|');
@@ -284 +286 @@
         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('|');
-
+        */
+        
         // if user wishes, W5100 may inform peer about receiption.
         // this should be done quickly, otherwise timeout may occur on 
@@ -306 +309 @@
         {
                 return 0;
-        }       
+        }
+        
         U16 last_TX_write_pointer = get_S0_TX_WR();
         U16 offset = last_TX_write_pointer & S0_TX_MASK;
         U16 start_address =  S0_TX_BASE + offset;
 
+        usart_write_crlf();
+        usart_write_crlf();
+        usart_write_str((pU08)"lwp :");
+        usart_write_U16_hex(last_TX_write_pointer);
+        usart_write_crlf();
+        
+        usart_write_str((pU08)"off :");
+        usart_write_U16_hex(offset);
+        usart_write_crlf();
+        
+        usart_write_str((pU08)"stad:");
+        usart_write_U16_hex(start_address);
+        usart_write_crlf();
+        
 
         U16 upper_size, lower_size;
@@ -338 +356 @@
                 {
                         w5100_write(start_address + i, string[i]);
+                        usart_write_str((pU08)"wr:");
+                        usart_write_U16_hex(start_address + i);
+                        usart_write_char(' ');
+                        usart_write_char(string[i]);
+                        usart_write_crlf();
+
                 }
                 for (U16 i = 0; i < lower_size; ++i)
                 {
                         w5100_write(S0_RX_BASE + i, string[upper_size+i]);
+                        usart_write_str((pU08)"wr:");
+                        usart_write_U16_hex(S0_RX_BASE + i);
+                        usart_write_char(' ');
+                        usart_write_char(string[upper_size+i]);
+                        usart_write_crlf();
+
                 }
         }
@@ -349 +379 @@
                 {
                         w5100_write(start_address + i, string[i]);
-                }
-        }
-
-        // inform W5100 about how much data was read out.
+                        usart_write_str((pU08)"wr:");
+                        usart_write_U16_hex(start_address + i);
+                        usart_write_char(' ');
+                        usart_write_char(string[i]);
+                        usart_write_crlf();
+
+                }
+        }
+
+        // inform W5100 about how much data was written.
         set_S0_TX_WR(last_TX_write_pointer + NumBytes);
-        
+                usart_write_str((pU08)"wrpt:");
+                usart_write_U16_hex(last_TX_write_pointer + NumBytes);
+                usart_write_crlf();
+
         // tell it to send now the data away
         w5100_write( S0_CR, CR_SEND);