From 5df11a171a2f534a1cdabb9e621b904d079ff288 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Wed, 27 Apr 2011 04:54:38 +0200
Subject: [PATCH] fix opamps

---
 firmware/src/edubrm.c           | 21 +++-------
 software/modules/ModuleDebug.ui | 69 ++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/firmware/src/edubrm.c b/firmware/src/edubrm.c
index 295fd31..f219051 100644
--- a/firmware/src/edubrm.c
+++ b/firmware/src/edubrm.c
@@ -61,26 +61,15 @@ void SetOutReport (uint8_t dst[], uint32_t length)
 			gain = dst[3];
 			if (which == 1) {
 				LPC_GPIO3->MASKED_ACCESS[1<<3] &= ((0<<3) | ~(1<<3));		// set chipselect to 0
-			} else {
-				LPC_GPIO3->MASKED_ACCESS[1<<2] &= ((0<<2) | ~(1<<2));		// set chipselect to 0
-			}
-			// set channel
-			SSPSend2(0x41, chan); // 000 - ch#1, 101 - ch#6
-			if (which == 1) {
+				SSPSend2(0x40, gain); // gain: 000 - 1, 111 - 32
 				LPC_GPIO3->MASKED_ACCESS[1<<3] |= (1<<3);					// set chipselect to 1
 			} else {
+				LPC_GPIO3->MASKED_ACCESS[1<<2] &= ((0<<2) | ~(1<<2));		// set chipselect to 0
+				SSPSend2(0x41, chan); // chan: 000 - ch#1, 101 - ch#6
 				LPC_GPIO3->MASKED_ACCESS[1<<2] |= (1<<2);					// set chipselect to 1
-			}
-			if (which == 1) {
-				LPC_GPIO3->MASKED_ACCESS[1<<3] &= ((0<<3) | ~(1<<3));		// set chipselect to 0
-			} else {
+				for (which = 0; which < 75; which++) {}
 				LPC_GPIO3->MASKED_ACCESS[1<<2] &= ((0<<2) | ~(1<<2));		// set chipselect to 0
-			}
-			// set gain
-			SSPSend2(0x40, gain); // 000 - 1, 111 - 32
-			if (which == 1) {
-				LPC_GPIO3->MASKED_ACCESS[1<<3] |= (1<<3);					// set chipselect to 1
-			} else {
+				SSPSend2(0x40, gain); // gain: 000 - 1, 111 - 32
 				LPC_GPIO3->MASKED_ACCESS[1<<2] |= (1<<2);					// set chipselect to 1
 			}
 			break;
diff --git a/software/modules/ModuleDebug.ui b/software/modules/ModuleDebug.ui
index f3c7dbb..b5ccad3 100644
--- a/software/modules/ModuleDebug.ui
+++ b/software/modules/ModuleDebug.ui
@@ -231,7 +231,7 @@
     <rect>
      <x>10</x>
      <y>150</y>
-     <width>151</width>
+     <width>161</width>
      <height>111</height>
     </rect>
    </property>
@@ -255,31 +255,6 @@
       <string>ch 1</string>
      </property>
     </item>
-    <item>
-     <property name="text">
-      <string>ch 2</string>
-     </property>
-    </item>
-    <item>
-     <property name="text">
-      <string>ch 3</string>
-     </property>
-    </item>
-    <item>
-     <property name="text">
-      <string>ch 4</string>
-     </property>
-    </item>
-    <item>
-     <property name="text">
-      <string>ch 5</string>
-     </property>
-    </item>
-    <item>
-     <property name="text">
-      <string>ch 6</string>
-     </property>
-    </item>
    </widget>
    <widget class="QComboBox" name="comboAMP2c">
     <property name="geometry">
@@ -324,7 +299,7 @@
    <widget class="QComboBox" name="comboAMP1g">
     <property name="geometry">
      <rect>
-      <x>80</x>
+      <x>90</x>
       <y>30</y>
       <width>61</width>
       <height>31</height>
@@ -374,7 +349,7 @@
    <widget class="QComboBox" name="comboAMP2g">
     <property name="geometry">
      <rect>
-      <x>80</x>
+      <x>90</x>
       <y>70</y>
       <width>61</width>
       <height>31</height>
@@ -421,11 +396,43 @@
      </property>
     </item>
    </widget>
+   <widget class="QLabel" name="labelOO">
+    <property name="geometry">
+     <rect>
+      <x>70</x>
+      <y>30</y>
+      <width>21</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>O</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
+   <widget class="QLabel" name="labelOI">
+    <property name="geometry">
+     <rect>
+      <x>70</x>
+      <y>70</y>
+      <width>21</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>I</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
   </widget>
   <widget class="QGroupBox" name="groupOut">
    <property name="geometry">
     <rect>
-     <x>310</x>
+     <x>320</x>
      <y>150</y>
      <width>151</width>
      <height>111</height>
@@ -534,7 +541,7 @@
   <widget class="QGroupBox" name="groupSwitches">
    <property name="geometry">
     <rect>
-     <x>170</x>
+     <x>180</x>
      <y>150</y>
      <width>131</width>
      <height>111</height>
@@ -684,7 +691,7 @@
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     </property>
     <property name="text" stdset="0">
-     <string>1</string>
+     <string>0</string>
     </property>
     <property name="minimum">
      <number>0</number>