Changeset 59

Timestamp:

03/20/10 13:24:05 (15 years ago)

Author:

phil

Message:

adaptation to new ETT 4 channel opto I/O board

Files:

• webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) (2 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) (1 diff)

webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c

@@ -119 +119 @@
-  /* bits are 0 here */
-  /* disable pull-up/down resistors on 2.0, 2.1, 2.3, 2.4 (put binary 10 for all), don't change 2.2! */
-
+// dont change anymore :  
-
-
@@ -126 +126 @@
-  IO2_INT_EN_R |= (1<<1); /* enable rising edge interrupt for P2:1 */
-  IO2_INT_EN_F &= ~(1<<1); /* disable falling edge interrupt for P2:1 */
-
-
-
+
+
-  IO2_INT_EN_R |= (1<<3); /* enable rising edge interrupt for P2:3 */
-  IO2_INT_EN_F &= ~(1<<3); /* disable falling edge interrupt for P2:3 */
-
-
+
+
+
-
-  VICVectAddr17 = (portLONG) vP2_0_ISR_Wrapper; /* EINT-3 interrupt handler */

webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c

@@ -46 +46 @@
-    IO2_INT_CLR |= (1<<1);
-  }
-
-
-
-
-
-
-
+
+
+
+
+
+
-  {
-    handleMeterTick(METER_INDEX_AU1);
-    IO2_INT_CLR |= (1<<3);
-  }
-if ((IO2_INT_STAT_R & (1 << 4)) != 0) /* P0.4 interrupt triggered - connector J4, Pin 4*/
-{
-  handleMeterTick(METER_INDEX_AU2);
-  IO2_INT_CLR |= (1<<4
-}
-
+// P0.4 is not connected!
+//if ((IO2_INT_STAT_R & (1 << 4)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/
+//{
+// handleMeterTick(METER_INDEX_AU2
+//  IO2_INT_CLR |= (1<<4);
+
-  /* Clear the interrupt. */ 
-  VICVectAddr = 0;