Skip to content

Commit fe26915

Browse files
Fix defines, add date and time functions, fix spacing
1 parent 83237c0 commit fe26915

File tree

12 files changed

+991
-964
lines changed

12 files changed

+991
-964
lines changed

CEdev/bin/main_makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LIBHEADER_ASM := libheader.asm
77
#----------------------------
88

99
SHELL := cmd.exe
10-
VERSION := 6.6
10+
VERSION := 6.7
1111

1212
#----------------------------
1313
# Try not to edit anything below these lines unless you know what you are doing

CEdev/examples/demo_7/src/main.h

Lines changed: 0 additions & 4 deletions
This file was deleted.
Binary file not shown.

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ void fillScreen(uint8_t color);
2020
void main(void) {
2121
/* Key varaible */
2222
kb_key_t key;
23-
23+
2424
/* Loop until 2nd is pressed */
25-
while(kb_ScanGroup(kb_group_1) != kb_2nd) {
26-
key = kb_ScanGroup(kb_group_7);
25+
do {
26+
/* Update kb_Data */
27+
kb_Scan();
28+
29+
/* Load group 7 registers */
30+
key = kb_Data[kb_group_7];
2731

2832
switch(key) {
2933
case kb_Down: /* Change screen color to black */
@@ -41,7 +45,8 @@ void main(void) {
4145
default:
4246
break;
4347
}
44-
}
48+
} while( kb_Data[kb_group_1] != kb_2nd );
49+
4550
prgm_CleanUp();
4651
}
4752

Binary file not shown.

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,17 @@ void printText(int8_t xpos, int8_t ypos, const char *text);
2020
void main(void) {
2121
/* Key varaible */
2222
kb_key_t key;
23-
char erase_string[] = " ";
24-
23+
const char *erase_string = " ";
24+
25+
prgm_CleanUp();
26+
2527
/* Loop until 2nd is pressed */
26-
while(kb_ScanGroup(kb_group_1) != kb_2nd) {
27-
key = kb_ScanGroup(kb_group_7);
28+
do {
29+
30+
/* Update kb_Data */
31+
kb_Scan();
32+
33+
key = kb_Data[kb_group_7];
2834

2935
/* Print the current arrow key input */
3036
if(key & kb_Down) {
@@ -47,7 +53,8 @@ void main(void) {
4753
} else {
4854
printText(0,3,erase_string);
4955
}
50-
}
56+
} while( kb_Data[kb_group_1] != kb_2nd );
57+
5158
prgm_CleanUp();
5259
}
5360

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void interrupt isr_keyboard(void);
2222

2323
/* Global Flag */
2424
uint8_t exit_loop = false;
25-
int a;
25+
2626
/* Main Function */
2727
void main(void) {
2828
/* Initialize the interrupt handlers */

CEdev/examples/readme.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

CEdev/include/lib/ce/keypadc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void kb_Reset(void);
8383
#define kb_IntAcknowledge (*(volatile uint8_t*)0xF50008)
8484
#define kb_IntStatus (*(volatile uint8_t*)0xF50008)
8585
#define kb_Config (*(uint8_t*)0xF50000)
86-
#define kb_Data ((uint16_t*)0xF50010)
86+
#define kb_Data (uint8_t)((uint16_t*)0xF50010)
8787

8888
#define KB_SCAN_COMPLETE (1<<0)
8989
#define KB_DATA_CHANGED (1<<1)
@@ -142,7 +142,7 @@ void kb_Reset(void);
142142
#define kb_8 1<<3
143143
#define kb_LParen 1<<4
144144
#define kb_Cos 1<<5
145-
#define kb_Pgrm 1<<6
145+
#define kb_Prgm 1<<6
146146
#define kb_Stat 1<<7
147147

148148
/**
@@ -222,7 +222,7 @@ void kb_Reset(void);
222222
#define kb_Key8 (kb_lkey_t)(4 << 8 | 1<<3)
223223
#define kb_KeyLParen (kb_lkey_t)(4 << 8 | 1<<4)
224224
#define kb_KeyCos (kb_lkey_t)(4 << 8 | 1<<5)
225-
#define kb_KeyPgrm (kb_lkey_t)(4 << 8 | 1<<6)
225+
#define kb_KeyPrgm (kb_lkey_t)(4 << 8 | 1<<6)
226226
#define kb_KeyStat (kb_lkey_t)(4 << 8 | 1<<7)
227227

228228
/**

0 commit comments

Comments
 (0)