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

Timestamp:

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

Author:

neise

Message:

 

File:

• firmware/FSC/src/application.c (modified) (5 diffs)

firmware/FSC/src/application.c

@@ -139 +139 @@
 U08     increase_adc (U08 channel){
 U08 effective_channel;
-        for ( U08 increase = 1 ; increase <= V_CHANNELS + I_CHANNELS + H_CHANNELS; increase++)
-        {
-                effective_channel = (channel + increase) % (V_CHANNELS + I_CHANNELS + H_CHANNELS);
+        for ( U08 increase = 1 ; increase <= VOLTAGE_CHANNELS; increase++)
+        {
+                effective_channel = (channel + increase) % (VOLTAGE_CHANNELS);
                 if (adc_enables[effective_channel/8] & (1<<effective_channel%8))
                         return effective_channel;
@@ -150 +150 @@
 U08     increase_ad7719 (U08 channel){
 U08 effective_channel;
-        for ( U08 increase = 1 ; increase <= TEMP_CHANNELS; increase++)
-        {
-                effective_channel = (channel + increase) % (TEMP_CHANNELS);
+        for ( U08 increase = 1 ; increase <= RESISTANCE_CHANNELS; increase++)
+        {
+                effective_channel = (channel + increase) % (RESISTANCE_CHANNELS);
                 if (ad7719_enables[effective_channel/8] & (1<<effective_channel%8))
                         return effective_channel;
@@ -161 +161 @@
 void check_if_measured_all() {
         adc_measured_all = true;
-        for ( U08 i=0; i<V_BITMAP + I_BITMAP + H_BITMAP; ++i ) {
+        for ( U08 i=0; i<(VOLTAGE_CHANNELS/8); ++i ) {
                 if ((adc_enables[i] ^ adc_channels_ready[i]) != 0x00) {
                         adc_measured_all = false;
@@ -168 +168 @@
         }
         ad7719_measured_all = true;
-        for ( U08 i=0; i<CHANNEL_BITMAP; ++i ) {
+        for ( U08 i=0; i<(RESISTANCE_CHANNELS/8); ++i ) {
                 if ((ad7719_enables[i] ^ ad7719_channels_ready[i]) != 0x00) {
                         ad7719_measured_all = false;
@@ -177 +177 @@
 
 }
+
+
+bool check_if_adc_measurement_done(){
+        adc_measured_all = true;
+        for ( U08 i=0; i<VOLTAGE_CHANNELS/8; ++i ) {
+                if ((adc_enables[i] ^ adc_channels_ready[i]) != 0x00) {
+                        adc_measured_all = false;
+                        break;
+                }
+        }
+        return adc_measured_all;
+}
+
+bool check_if_ad7719_measurement_done(){
+        ad7719_measured_all = true;
+        for ( U08 i=0; i<RESISTANCE_CHANNELS/8; ++i ) {
+                if ((ad7719_enables[i] ^ ad7719_channels_ready[i]) != 0x00) {
+                        ad7719_measured_all = false;
+                        break;
+                }
+        }
+        return ad7719_measured_all;
+}