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

Timestamp:

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

Author:

neise

Message:

 

File:

• firmware/FSC/src/FSC_test.c (modified) (6 diffs)

firmware/FSC/src/FSC_test.c

@@ -11 +11 @@
 #include "parser.h"
 #include "interpol.h"
+#include "timer.h"
 #include "w5100_spi_interface.h"
 #include <avr/interrupt.h>
@@ -29 +30 @@
         bool verbose;
         bool heartbeat_enable;
-
+/*
 // USART global variables
         U08 usart_rx_buffer[USART_RX_BUFFER_SIZE];
@@ -39 +40 @@
 // USART FLAGS
         bool usart_tx_buffer_overflow = false;  // true if usart_tx_buffer was full.
-        
+        */
 // TIMER global variable
         volatile U32 local_ms = 0;
 
 // AD7719 global variables
-        U32 ad7719_values[TEMP_CHANNELS];
-        U08 ad7719_enables[CHANNEL_BITMAP];
-        U08 ad7719_channels_ready[CHANNEL_BITMAP];
+        U32 ad7719_values[RESISTANCE_CHANNELS];
+        U08 ad7719_enables[RESISTANCE_CHANNELS/8];
+        U08 ad7719_channels_ready[RESISTANCE_CHANNELS/8];
         U08 ad7719_readings_since_last_muxing = 0;
         U08 ad7719_current_channel = 0;
@@ -53 +54 @@
         
 // ATMEGA ADC global variables
-        U08 adc_values[V_CHANNELS + I_CHANNELS + H_CHANNELS]; // stores measured voltage in steps of 16mV
-        U08 adc_enables[V_BITMAP + I_BITMAP + H_BITMAP];
-        U08 adc_channels_ready[V_BITMAP + I_BITMAP + H_BITMAP];
+        U08 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;
@@ -356 +357 @@
 */
 
-
+/*
 
 ISR (TIMER2_COMP_vect)
@@ -366 +367 @@
 
 
+*/