Changeset 10910 for firmware/FSC/src/output.c

Timestamp:

06/05/11 17:40:00 (13 years ago)

Author:

neise

Message:

 

File:

• firmware/FSC/src/output.c (modified) (7 diffs)

firmware/FSC/src/output.c

@@ -7 +7 @@
 void print_status() {
         usart_write_str((pU08)"adc status:\n");
-        for (U08 i=0; i< VOLTAGE_CHANNELS/8;++i) {
+        for (U08 i=0; i< VOLTAGE_REGS;++i) {
                 usart_write_U08_bin(adc_enables[i]);    
                 usart_write_char(' ');
         }
-        usart_write_char('\n');
-        for (U08 i=0; i< VOLTAGE_CHANNELS/8;++i){
+        usart_write_crlf();
+        for (U08 i=0; i< VOLTAGE_REGS;++i){
                 usart_write_U08_bin(adc_channels_ready[i]);
                 usart_write_char(' ');
         }
-        usart_write_char('\n');
+        usart_write_crlf();
 
         usart_write_str((pU08)"ad7719 status:\n");
@@ -23 +23 @@
                 usart_write_char(' ');
         }
-        usart_write_char('\n');
+        usart_write_crlf();
         for (U08 i=0; i< RESISTANCE_CHANNELS/8;++i){
                 usart_write_U08_bin(ad7719_channels_ready[i]);
                 usart_write_char(' ');
         }
-        usart_write_char('\n');
+        usart_write_crlf();
 
         usart_write_str((pU08)"time:");
         usart_write_U32(sec,10);
         usart_write_str((pU08)" sec.\n");
-
+/*
         usart_write_str((pU08)"adc measured all: ");
         if (adc_measured_all)
@@ -48 +48 @@
         usart_write_str((pU08)"adc current channel:");
         usart_write_U08(*adc_current_channel,2);
-        usart_write_char('\n');
+        usart_write_crlf();
 
         usart_write_str((pU08)"ad7719 current channel:");
         usart_write_U08(*ad7719_current_channel,2);
-        usart_write_char('\n');
-
+        usart_write_crlf();
+        
+        usart_write_str((pU08)"mux SB:");
+        usart_write_U08_hex(PORTC);
+        usart_write_str((pU08)" SA:");
+        usart_write_U08_hex(PORTA);
+        usart_write_crlf();
+*/
 }
 void print_adc_nicely() {
@@ -92 +98 @@
                         usart_write_str((pU08)" ");     
                 } else {
-                        usart_write_str((pU08)"         ");     
+                        usart_write_str((pU08)"       ");       
                 }
                 //usart_write_char('\n');
@@ -114 +120 @@
 }
 
-void adc_output(U08 channel, U08 data) {
+void adc_output(U08 channel, U16 data) {
 
 //      if (channel < 40) 
@@ -167 +173 @@
         //usart_write_U08(channel,2); // Numbers 1...8
         usart_write_char(':'); 
-        usart_write_U16((U16)data*16, 4); //data
+        usart_write_U16(data/(adc_readings_until_mean/4), 7); //data
 }
 
@@ -182 +188 @@
         w5100_set_TX(eth_write_buffer, 2); 
 }
+
+void print_help(){
+        usart_write_str((pU08)"printing help: -not yet- \n"); 
+}
+
+void print_adc_stupid() {
+        usart_write_str((pU08)"printing voltages in mV - stupid mode:\n");
+        for (U08 i = 0 ; i < VOLTAGE_CHANNELS ; ++i) {
+                usart_write_str((pU08)"ch:");
+                usart_write_U08(i,3);
+                usart_write_char(' ');
+                usart_write_U16_hex(adc_values[i]);
+                usart_write_char(' ');
+                usart_write_U16(adc_values[i],7);
+                usart_write_crlf(); 
+        }
+        usart_write_char('\n');
+}