X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2Fbetty.c;fp=betty%2Fbetty.c;h=2cd287f885825a1a179d5a523993399dee477db6;hp=d10456e30b8a8290c310b4312b305d4d3dc13bdd;hb=a409cb5b36482767f766ec9efc5dbecaa2274660;hpb=202c5cb4442b81aa5d0f7389b6dca62b2c121ac1

diff --git a/betty/betty.c b/betty/betty.c
index d10456e..2cd287f 100644
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -8,6 +8,15 @@
 /* includes */
 #include "betty.h"
 
+/*
+ * global variables
+ */
+
+const char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
+const char d1_txt[]="betty";
+const char d2_txt[]="- alphablend -";
+u8 contrast;
+
 /*
  * functions
  */
@@ -27,13 +36,79 @@ void display_string_page(u8 x,u8 p,u8 *s,u8 f,u8 o,u8 sp) {
 	}
 }
 
-/*
- * global variables
- */
-
-const char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
-const char d1_txt[]="betty";
-const char d2_txt[]="- alphablend -";
+void input_event(void) {
+
+	/* button test! */
+	if(button_get_event(&button)) {
+		switch(button.key[0]) {
+			case BUTTON_POWER:
+				display_logo((u8 *)default_logo);
+				break;
+			case BUTTON_DOWN:
+				if(contrast>0x00)
+					contrast-=1;
+				DISPLAY_SET_CONTRAST(contrast);
+				break;
+			case BUTTON_UP:
+				if(contrast<0x3f)
+					contrast+=1;
+				DISPLAY_SET_CONTRAST(contrast);
+				break;
+			case BUTTON_A:
+				display_fill_screen(DISPLAY_FILL_W);
+				break;
+			case BUTTON_B:
+				display_fill_screen(DISPLAY_FILL_LG);
+				break;
+			case BUTTON_C:
+				display_fill_screen(DISPLAY_FILL_DG);
+				break;
+			case BUTTON_D:
+				display_fill_screen(DISPLAY_FILL_B);
+				break;
+			case BUTTON_1:
+				display_rectangle_page(4,2,60,5,
+				                       DISPLAY_FILL_B,0xff);
+				break;
+			case BUTTON_2:
+				display_rectangle_page(40,5,50,5,
+				                       DISPLAY_FILL_LG,0x7f);
+				break;
+			case BUTTON_3:
+				break;
+			case BUTTON_4:
+				display_font_page(42,18,
+				                  (u8 *)default_font+(0x34<<3),
+				                  DISPLAY_FILL_B);
+				break;
+			case BUTTON_5:
+				display_font_page(50,18,
+				                  (u8 *)default_font+(0x35<<3),
+				                  DISPLAY_FILL_DG);
+				break;
+			case BUTTON_6:
+				display_font_page(58,18,
+				                  (u8 *)default_font+(0x36<<3),
+				                  DISPLAY_FILL_W);
+				break;
+			case BUTTON_7:
+				break;
+			case BUTTON_8:
+				break;
+			case BUTTON_BETTY:
+				display_string_page(50,13,(u8 *)d1_txt,
+				                    DISPLAY_FILL_B,0,8);
+				break;
+			case BUTTON_EXIT:
+				display_string_page(10,8,(u8 *)d2_txt,
+				                    DISPLAY_FILL_B,0,8);
+				break;
+			default:
+				display_clear_screen();
+				break;
+		}
+	}
+}
 
 /*
  * main function
@@ -43,7 +118,6 @@ int main() {
 
 	/* variables */
 	t_button button;
-	u8 contrast;
 
 	/* system init */
 	pll_init();
@@ -63,93 +137,37 @@ int main() {
 	display_bl_init();
 
 	/* button init */
+	button.mode=BUTTON_INT;
 	button_init(&button);
-	button_set_retries(&button,100);
+	button_set_retries(&button,0);
 
 	/* flash init */
 	flash_init();
 
+	/* display init */
+	display_init();
+	contrast=0x38;
+
+	/* interrupt init */
+	interrupt_init();
+	interrupt_ext_ir_config(INTERRUPT_EXT3,INTERRUPT_EXT_NOWAKE,
+	                        INTERRUPT_EXT_MODE_EDGE,
+	                        INTERRUPT_EXT_POLAR_LOW);
+	interrupt_enable(INTERRUPT_EINT3,INTERRUPT_MODE_VIRQ,0,input_event);
+
 	/*
 	 * start it ...
 	 */
 
-	/* display init */
+	/* toggle the display back light */
 	display_bl_toggle();
-	display_init();
-	contrast=0x38;
-
-	/* pasue again */
 
 	/* announce */
 	uart0_send_string((char *)announce);
 
 	
 	while(1) {
-		pause(0x0fffff);
-
-		/* button test! */
-		if(button_get_event(&button)) {
-			//uart0_send_string(announce);
-			switch(button.key[0]) {
-				case BUTTON_POWER:
-					display_logo((u8 *)default_logo);
-					break;
-				case BUTTON_DOWN:
-					if(contrast>0x00)
-						contrast-=1;
-					DISPLAY_SET_CONTRAST(contrast);
-					break;
-				case BUTTON_UP:
-					if(contrast<0x3f)
-						contrast+=1;
-					DISPLAY_SET_CONTRAST(contrast);
-					break;
-				case BUTTON_A:
-					display_fill_screen(DISPLAY_FILL_W);
-					break;
-				case BUTTON_B:
-					display_fill_screen(DISPLAY_FILL_LG);
-					break;
-				case BUTTON_C:
-					display_fill_screen(DISPLAY_FILL_DG);
-					break;
-				case BUTTON_D:
-					display_fill_screen(DISPLAY_FILL_B);
-					break;
-				case BUTTON_1:
-					display_rectangle_page(4,2,60,5,DISPLAY_FILL_B,0xff);
-					break;
-				case BUTTON_2:
-					display_rectangle_page(40,5,50,5,DISPLAY_FILL_LG,0x7f);
-					break;
-				case BUTTON_3:
-					break;
-				case BUTTON_4:
-					display_font_page(42,18,(u8 *)default_font+(0x34<<3),DISPLAY_FILL_B);
-					break;
-				case BUTTON_5:
-					display_font_page(50,18,(u8 *)default_font+(0x35<<3),DISPLAY_FILL_DG);
-					break;
-				case BUTTON_6:
-					display_font_page(58,18,(u8 *)default_font+(0x36<<3),DISPLAY_FILL_W);
-					break;
-				case BUTTON_7:
-					break;
-				case BUTTON_8:
-					break;
-				case BUTTON_BETTY:
-					display_string_page(50,13,(u8 *)d1_txt,DISPLAY_FILL_B,0,8);
-					break;
-				case BUTTON_EXIT:
-					display_string_page(10,8,(u8 *)d2_txt,DISPLAY_FILL_B,0,8);
-					break;
-				default:
-					display_clear_screen();
-					break;
-			}
-		}
 	}
 
 	return 0;
 }
-