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

Timestamp:

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

Author:

neise

Message:

 

File:

• firmware/FSC/src/parser.c (modified) (13 diffs)

firmware/FSC/src/parser.c

@@ -33 +33 @@
                 case 'G':                       // GET the Temperature channels, which are enabled
                         once_told_you = false;
-                        for ( U08 i=0; i<CHANNEL_BITMAP; ++i ) {
+                        for ( U08 i=0; i<RESISTANCE_CHANNELS/8; ++i ) {
                                 ad7719_channels_ready[i]=0;
                         }
@@ -40 +40 @@
                 case 'g':                       // GET the voltage/current/humidity channels, which are enabled
                         once_told_you = false;
-                        for ( U08 i=0; i<V_BITMAP + I_BITMAP + H_BITMAP; ++i ) {
+                        for ( U08 i=0; i<VOLTAGE_CHANNELS/8; ++i ) {
                                 adc_channels_ready[i]=0;
                         }
@@ -84 +84 @@
 // to be discarded, because something went wrong, and the bytemade no sense...
 // the end of a commmand, and so the 'real parser' may do his work.
-
+/*
 void incoming_byte_parser() {
         static bool receiving_command = false;
@@ -105 +105 @@
         
 }
-
+*/
+/*
 
 // this is the recent MSR parser
@@ -124 +125 @@
         usart_write_str(usart_rx_buffer);
         usart_write_char('\n');
-        //usart_write_str((pU08)"\n received number of bytes:");
-        //usart_write_U08(usart_rx_buffer_index,3);
-
-        if (usart_rx_buffer_index >0) {
+        
+
+        if (usart_received_chars >0) {
                 switch (usart_rx_buffer[0]) {
                         case 'E':               // user wants to enable/disable something
@@ -135 +135 @@
                         case 'd':
                         
-                                if (usart_rx_buffer_index>=1) {  // let's see what.
+                                if (usart_received_chars>=1) {  // let's see what.
                                         if (    usart_rx_buffer[1] != 'r'  &&
                                                         usart_rx_buffer[1] != 'v'  &&
@@ -141 +141 @@
                                                         usart_rx_buffer[1] != 'p' )
                                                 {
-                                                        print_invalid_enable_statement();
+                                                        //print_invalid_enable_statement();
                                                         break;
                                                 }
@@ -147 +147 @@
                                 
                                 input_number = 0;
-                                if (usart_rx_buffer_index >2) {  // lets check the first digit
+                                if (usart_received_chars >2) {  // lets check the first digit
                                         if ( usart_rx_buffer[2] >= '0' && usart_rx_buffer[2] <= '9' ) {
                                                 input_number = usart_rx_buffer[2] - '0';
                                         } else {
-                                                print_invalid_enable_statement();
+                                                //print_invalid_enable_statement();
                                                 break;
                                         }
                                 }
-                                if (usart_rx_buffer_index >3) {  // lets check the 2nd digit
+                                if (usart_received_chars >3) {  // lets check the 2nd digit
                                         if ( usart_rx_buffer[3] >= '0' && usart_rx_buffer[3] <= '9' ) {
                                                 input_number = 10*input_number + usart_rx_buffer[3] - '0';
@@ -164 +164 @@
                                         }
                                 }
-                                if (usart_rx_buffer_index>2) {
+                                if (usart_received_chars>2) {
                                         usart_write_str((pU08)"\n I will switch ");
                                         if (enable) 
@@ -226 +226 @@
                                         
                                         
-                                }// end of if usart_rx_buffer_index>2  --> this should not be necessary at all
+                                }// end of if usart_received_chars>2  --> this should not be necessary at all
                                 break;
                                 
@@ -241 +241 @@
                         case 'G':                       // GET the Temperature channels, which are enabled
                                 ad7719_values_printed = false;
-                                for ( U08 i=0; i<CHANNEL_BITMAP; ++i ) {
+                                for ( U08 i=0; i<RESISTANCE_CHANNELS/8; ++i ) {
                                         ad7719_channels_ready[i]=0;
                                 }
@@ -247 +247 @@
                         case 'g':                       // GET the voltage/current/humidity channels, which are enabled
                                 adc_values_printed = false;
-                                for ( U08 i=0; i<V_BITMAP; ++i ) {
+                                for ( U08 i=0; i<VOLTAGE_CHANNELS/8; ++i ) {
                                         adc_channels_ready[i]=0;
                                 }
@@ -301 +301 @@
         for (U08 i=0; i<USART_RX_BUFFER_SIZE; ++i)
                 usart_rx_buffer[i] = 0;
-        usart_rx_buffer_index = 0;      
+        usart_received_chars = 0;       
         usart_rx_ready = false;
 }       // END of MSR_parser();
 
+*/