Fixed some interrupt and keypad things

Author: mateoconlechuga

CEdev/examples/demo_7/src/main.c

@@ -18,8 +18,6 @@
 void interrupt isr_timer1(void);
 void interrupt isr_on(void);
 
-/* Global status flag */
-bool exit_loop = false;
 /* Location of memory-mapped screen */
 uint16_t *lcd_vramArray = (uint16_t*)0xD40000;
 

CEdev/examples/library_examples/fileio/demo_0/bin/FILEIO0.8xp

@@ -22,7 +22,7 @@ void interrupt isr_keyboard(void);
 
 /* Global Flag */
 uint8_t exit_loop = false;
-
+int a;
 /* Main Function */
 void main(void) {
 	/* Initialize the interrupt handlers */
@@ -37,7 +37,7 @@ void main(void) {
 	kb_EnableInt = KB_DATA_CHANGED;
 
 	/* Configure the keypad to be continously scanning */
-	kb_Config = MODE_3_CONTINUOUS | DEFAULT_SCAN_CYCLES;
+	kb_SetMode(MODE_3_CONTINUOUS);
 
 	/* Interrupts can now generate after this */
 	int_Enable();
@@ -47,6 +47,7 @@ void main(void) {
 
 	/* Reset the interrupt handler and cleanup the program */
 	int_Reset();
+	kb_Reset();
 	prgm_CleanUp();
 }
 
@@ -71,5 +72,5 @@ void interrupt isr_keyboard(void) {
 	/* Must acknowledge that the interrupt occured to clear the flag */
 	int_Acknowledge = INT_KEYBOARD;
 	/* Acknowledge in the keypad controller (Not technically required because interrupt controller handles signal) */
-	//kb_IntAcknowledge = KB_DATA_CHANGED;
+	kb_IntAcknowledge = KB_DATA_CHANGED;
 }

CEdev/examples/library_examples/keypad/demo_2/bin/KEYPAD2.8xp

@@ -37,7 +37,7 @@ void main(void) {
 	kb_EnableInt = KB_MODE_1_PRESS;
 
 	/* Configure the keypad to be continously scanning */
-	kb_Config = MODE_1_INDISCRIMINATE | DEFAULT_SCAN_CYCLES;
+	kb_SetMode(MODE_1_INDISCRIMINATE);
 
 	/* Interrupts can now generate after this */
 	int_Enable();
@@ -47,6 +47,7 @@ void main(void) {
 
 	/* Reset the interrupt handler and cleanup the program */
 	int_Reset();
+	kb_Reset();
 	prgm_CleanUp();
 }
 

CEdev/examples/library_examples/keypad/demo_2/src/main.c

@@ -68,17 +68,18 @@ void kb_Scan(void);
  */
 void kb_Reset(void);
 
-#define kb_EnableInt			(*(uint8_t*)0xF5000C)
-#define kb_IntAcknowledge		(*(volatile uint8_t*)0xF50008)
-#define kb_IntStatus			(*(volatile uint8_t*)0xF50008)
-#define kb_Config			(*(uint32_t*)0xF50000)
-#define kb_DataArray			((uint16_t*)0xF50010)
+#define kb_SetMode(mode)		(kb_Config = (kb_Config & ~3)|mode)
 
 #define MODE_0_IDLE			(0)
 #define MODE_1_INDISCRIMINATE		(1)
 #define MODE_2_SINGLE			(2)
 #define MODE_3_CONTINUOUS		(3)
-#define DEFAULT_SCAN_CYCLES		(0x0F0F0000)
+
+#define kb_EnableInt			(*(uint8_t*)0xF5000C)
+#define kb_IntAcknowledge		(*(volatile uint8_t*)0xF50008)
+#define kb_IntStatus			(*(volatile uint8_t*)0xF50008)
+#define kb_Config			(*(uint8_t*)0xF50000)
+#define kb_DataArray			((uint16_t*)0xF50010)
 
 #define KB_SCAN_COMPLETE		1<<0
 #define KB_DATA_CHANGED			1<<1

CEdev/examples/library_examples/keypad/demo_3/bin/KEYPAD3.8xp

@@ -15,6 +15,41 @@
 /* RTC define -- useful for srand() */
 #define rtc_Time()	(*(volatile uint32_t*)0xF30044)
 
+/* RTC definitions */
+#define RTC_UNFREEZE		(1<<7)
+#define RTC_FREEZE		(0<<7)
+#define RTC_LOAD		(1<<6)
+#define RTC_ALARM_INT_SOURCE	(1<<5)
+#define RTC_DAY_INT_SOURCE	(1<<4)
+#define RTC_HR_INT_SOURCE	(1<<3)
+#define RTC_MIN_INT_SOURCE	(1<<2)
+#define RTC_SEC_INT_SOURCE	(1<<1)
+#define RTC_ENABLE		(1<<0)|RTC_UNFREEZE
+#define RTC_DISABLE		(0<<0)
+
+#define RTC_LOAD_INT		(1<<5)
+#define RTC_ALARM_INT		(1<<4)
+#define RTC_DAY_INT		(1<<3)
+#define RTC_HR_INT		(1<<2)
+#define RTC_MIN_INT		(1<<1)
+#define RTC_SEC_INT		(1<<0)
+
+#define rtc_Seconds		(*(volatile uint8_t*)0xF30000)
+#define rtc_Minutes		(*(volatile uint8_t*)0xF30004)
+#define rtc_Hours		(*(volatile uint8_t*)0xF30008)
+#define rtc_Days		(*(volatile uint16_t*)0xF3000C)
+#define rtc_AlarmSeconds	(*(uint8_t*)0xF30010)
+#define rtc_AlarmMinutes	(*(uint8_t*)0xF30014)
+#define rtc_AlarmHours		(*(uint8_t*)0xF30018)
+#define rtc_Control		(*(uint8_t*)0xF30020)
+#define rtc_LoadSeconds		(*(uint8_t*)0xF30024)
+#define rtc_LoadMinutes		(*(uint8_t*)0xF30028)
+#define rtc_LoadHours		(*(uint8_t*)0xF3002C)
+#define rtc_LoadDays		(*(uint16_t*)0xF30030)
+#define rtc_IntStatus		(*(volatile uint8_t*)0xF30037)
+#define rtc_IntAcknowledge	(*(volatile uint8_t*)0xF30034)
+#define rtc_IsBusy()		(rtc_Control & RTC_LOAD)
+
 /**
  * Resets the RTC back to its original values
  * If enable is true, the RTC will be enabled during this function

CEdev/examples/library_examples/keypad/demo_3/src/main.c

@@ -25,6 +25,10 @@ intRtc			equ	1000h
 ;-------------------------------------------------------------------------------
 _int_Initialize:
 	di
+	ld	de,lconf
+	ld	hl,mpIntMask
+	ld	bc,16
+	ldir
 	ld	hl,cconf
 	ld	de,mpIntMask
 	ld	bc,16
@@ -125,12 +129,11 @@ _int_Reset:
 	ldir
 	im	1
 	ret
-	
-lconf:	db 011h,030h,000h,000h
+	segment bss
+lconf:	ds	16
+	segment data
+cconf:	; Mask
 	db 000h,000h,000h,000h
-	db 019h,000h,000h,000h
-	; Mask
-cconf:	db 000h,000h,000h,000h
 	; ACK
 	db 0FFh,0FFh,0FFh,0FFh
 	; Latch

CEdev/include/lib/ce/keypadc.h

@@ -35,7 +35,7 @@
  .beginDependencies
  .endDependencies
 
-resizeBytes	equ 0E30C0Eh
+resizeBytes	equ 0E30C0Ch
 currSlot	equ 0E30C11h
 charIn		equ 0E30C12h