Changeset 456

Timestamp:

02/19/07 01:32:09 (2 years ago)

Author:

goodea

Message:

oh wow interrupt.c

Files:

• trunk/hal/lpc2106-cmucam3/cc3.c (modified) (1 diff)
• trunk/hal/lpc2106-cmucam3/cc3_hal.c (modified) (2 diffs)
• trunk/hal/lpc2106-cmucam3/cc3_pin_defines.h (modified) (1 diff)
• trunk/hal/lpc2106-cmucam3/interrupt.c (modified) (5 diffs)
• trunk/hal/lpc2106-cmucam3/interrupt.h (modified) (1 diff)
• trunk/hal/virtual-cam/cc3.c (modified) (1 diff)
• trunk/include/cc3.h (modified) (1 diff)
• trunk/projects/cmucam2/cmucam2.c (modified) (4 diffs)

trunk/hal/lpc2106-cmucam3/cc3.c

@@ -742 +742 @@
-bool cc3_button_get_state (void)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return result;
-}

trunk/hal/lpc2106-cmucam3/cc3_hal.c

@@ -19 +19 @@
-#include "cc3_hal.h"
-#include "cc3_pin_defines.h"
+#include "interrupt.h"
-#include "serial.h"
-#include <stdio.h>
@@ -59 +60 @@
-
-  //REG(PCB_PINSEL1) = 0x1;  // External interrupt 0
+
+  enable_button_interrupt ();
-
-  // Setup timer0 to count by milliseconds starting from 0

trunk/hal/lpc2106-cmucam3/cc3_pin_defines.h

@@ -69 +69 @@
-#define _CC3_LED_2              _CC3_SERVO_3 
-
+// button
-#define _CC3_BUTTON             0x00004000
+#define _CC3_BUTTON_PINSEL_MASK 0x30000000
+#define _CC3_BUTTON_PINSEL      0x20000000
-
-// SPI

trunk/hal/lpc2106-cmucam3/interrupt.c

@@ -28 +28 @@
-#include "cc3_hal.h"
-
+volatile bool _cc3_button_trigger;
+
-void disable_ext_interrupt (void)
-{
-En
+Dis
-    REG (VICIntEnClr) = 0x4000;
-
-
+
+
+
+
-}
-
@@ -39 +43 @@
-void enable_ext_interrupt (void)
-{
-
+
+
-    // Enable bit 14, which is the external interrupt 0...
-    REG (VICIntEnable) = 0x4000;
-    // Clear the interrupt status flag...
-    REG (PCB_PINSEL1) = 0x1;    // Switch from GPIO to EIN0 mode
-}
-
-void enable_servo_interrupt (void)
-{
-
+ 
-    REG (VICIntEnable) = 0x20;
-
-}
-
@@ -56 +58 @@
-{
-    REG (VICIntEnClr) = 0x20;
-
-}
-
+void enable_button_interrupt (void)
+{
+  //uart0_write("button int enable\r\n");
+  // pin select
+  REG(PCB_PINSEL0) = (REG(PCB_PINSEL0) &
+                      ~_CC3_BUTTON_PINSEL_MASK) | _CC3_BUTTON_PINSEL;
+
+  // vic bit 15: EINT1
+  REG (VICIntEnable) = 0x8000;
+}
+
+void disable_button_interrupt (void)
+{
+  //uart0_write("button int disable\r\n");
+
+  // vic bit 15: EINT1
+  REG (VICIntEnClr) = 0x8000;
+
+  // pin select back to GPIO
+  REG(PCB_PINSEL0) = (REG(PCB_PINSEL0) & ~_CC3_BUTTON_PINSEL_MASK);
+
+  // clear the interrupt
+  REG (SYSCON_EXTINT) = 0x2;
+}
-
-void interrupt (void)
@@ -64 +89 @@
-//asm volatile ( "msr cpsr_c,0x1F" ); // MODE_SYS
-
+  //uart0_write_hex(REG(VICRawIntr));
-    //printf( "Got interrupt: %d\r\n",REG(VICRawIntr) );
-    if (REG (VICRawIntr) & 0x4000) {
+      //uart0_write("vref interrupt\r\n");
-        // Triggered on VREF telling when a frame is complete.
-        // Simply disable the FIFO once the frame has been captured. 
@@ -73 +100 @@
-        _cc3_pixbuf_write_rewind ();
-        disable_ext_interrupt ();
+    }
+
+    if (REG (VICRawIntr) & 0x8000) {
+      // button press
+      //uart0_write("button int\r\n");
+      _cc3_button_trigger = true;
+      disable_button_interrupt ();
-    }
-

trunk/hal/lpc2106-cmucam3/interrupt.h

@@ -20 +20 @@
-#define INTERRUPT_H
-
+#include <stdbool.h>
+
+extern volatile bool _cc3_button_trigger;
+
-void enable_ext_interrupt (void);
-void disable_ext_interrupt (void);
-void enable_servo_interrupt (void);
-void disable_servo_interrupt (void);
+void enable_button_interrupt (void);
+void disable_button_interrupt (void);
+
-void interrupt (void);
-

trunk/hal/virtual-cam/cc3.c

@@ -760 +760 @@
-}
-
+bool cc3_button_get_and_reset_trigger (void)
+{
+  return 1;
+}
+
-void cc3_filesystem_init (void)
-{

trunk/include/cc3.h

@@ -415 +415 @@
-bool cc3_button_get_state (void);
-
+/**
+ * Get and reset the trigger functionality of the button.
+ *
+ * @return \a true if the button has been pressed since the
+ * last time this function was called.
+ */
+bool cc3_button_get_and_reset_trigger (void);
-
-/**

trunk/projects/cmucam2/cmucam2.c

@@ -74 +74 @@
-  PACKET_FILTER,
-  CONF_HISTOGRAM,
+  GET_BUTTON,
-  CMUCAM2_CMD_END               // Must be last entry so array sizes are correct
-} cmucam2_command_t;
@@ -134 +135 @@
-  cmucam2_cmds[GET_INPUT] = "GI";
-  cmucam2_cmds[SET_INPUT] = "SI";  // new for cmucam3
-//  GB get button
+cmucam2_cmds[GET_BUTTON] = "GB";
-  cmucam2_cmds[LED_0] = "L0";
-  //  L1 LED control
@@ -774 +775 @@
-        printf("%d\r", cc3_gpio_get_servo_position(arg_list[0]));
-        break;
-
+
-      case GET_INPUT:
-        if (n != 0) {
@@ -797 +798 @@
-        cc3_gpio_set_mode (arg_list[0], CC3_GPIO_MODE_INPUT);
-
+        break;
+
+      case GET_BUTTON:
+        if (n != 0) {
+          error = true;
+          break;
+        }
+        print_ACK ();
+        if (cc3_button_get_and_reset_trigger()) {
+          printf("1\r");
+        } else {
+          printf("0\r");
+        }
-        break;
-