PlaneteCasio
/
Eigenmath
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some code cleaning

This commit is contained in:
Nemh 2015-02-04 00:21:45 +01:00
parent 6cb1541ce6
commit 37b2fee1f5
4 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ALGEBRA.G1A
View File

Binary file not shown.

BIN
INIT/CasioRAM.mem
View File

Binary file not shown.

BIN
INIT/CasioUserROM.mem
View File

Binary file not shown.

45
console.c
View File

@ -546,31 +546,7 @@ int Console_GetKey()
int Console_FMenu(int key)
{
//unsigned char *entries[MAX_MENU_ITEMS] = {NULL};
return Console_Draw_FMenu(key, &FMenu_entries[key-KEY_CTRL_F1]);
/*/if(key == KEY_CTRL_F1) {
entries[0] = (unsigned char *)Console_Make_Entry((const unsigned char *)"sqrt(");
entries[1] = (unsigned char *)Console_Make_Entry((const unsigned char *)"cos(");
entries[2] = (unsigned char *)Console_Make_Entry((const unsigned char *)"root(");
//return Console_Draw_FMenu(key, entries);
return Console_Draw_FMenu(key, &FMenu_entries[0]);
}
if(key == KEY_CTRL_F2) {
return Console_Draw_FMenu(key, &FMenu_entries[1]);
}
if(key == KEY_CTRL_F3) {
return Console_Draw_FMenu(key, &FMenu_entries[2]);
}
if(key == KEY_CTRL_F4) {
return Console_Draw_FMenu(key, &FMenu_entries[3]);
}
if(key == KEY_CTRL_F5) {
return Console_Draw_FMenu(key, &FMenu_entries[4]);
}
if(key == KEY_CTRL_F6) {
return Console_Draw_FMenu(key, &FMenu_entries[5]);
}*/
return 0;
}
unsigned char *Console_Make_Entry(const unsigned char* str)
@ -582,6 +558,7 @@ unsigned char *Console_Make_Entry(const unsigned char* str)
return entry;
}
//Draws and runs the asked for menu.
int Console_Draw_FMenu(int key, struct FMenu* menu)
{
int i, nb_entries = 0, selector = 0, position_number, position_x, ret, longest = 0;
@ -667,11 +644,10 @@ int Console_Init()
return CONSOLE_SUCCEEDED;
}
// Loads the FMenus' data into memory, from a cfg file
void Console_FMenu_Init()
{
//ToDo : handle when there's no file ...
int i, number=0, key, handle;
//unsigned char debug[40] = {'\0'};
unsigned char* tmp_realloc = NULL;
unsigned char temp[20] = {'\0'};
unsigned char* original_cfg;
@ -693,13 +669,16 @@ void Console_FMenu_Init()
original_cfg = cfg;
while(*cfg) {
//Get each line
for(i=0; i<20, *cfg && *cfg!='\r' && *cfg!='\n'; i++, cfg++) {
temp[i] = *cfg;
}
//if(temp[i-1] == '\r') temp[i-1]='\0';
//If starting by 'F', adjust the number of the menu
if(temp[0] == 'F' && temp[1]>='1' && temp[1]<='6') number = temp[1]-'0' - 1;
//Else, fill the current menu
else if(temp[0]) {
//Alloc a new string a copy current data into it
tmp_realloc=FMenu_entries[number].str;
FMenu_entries[number].str = realloc(tmp_realloc, sizeof(unsigned char*)*(FMenu_entries[number].count+1));
@ -713,15 +692,7 @@ void Console_FMenu_Init()
FMenu_entries[number].count--;
}
else {
//sprintf(debug, "number = %d and count = %d", number, FMenu_entries[number].count);
strcpy(FMenu_entries[number].str[FMenu_entries[number].count], temp);
///PrintMini(10,30, debug, MINI_OVER);
//PrintMini(50,40, FMenu_entries[number].str[FMenu_entries[number].count], MINI_OVER);
//if(FMenu_entries[number].count>0)PrintMini(50,50, FMenu_entries[number].str[FMenu_entries[number].count-1], MINI_OVER);
//GetKey(&key);
//Bdisp_AllClr_VRAM();
}
else strcpy(FMenu_entries[number].str[FMenu_entries[number].count], temp);
FMenu_entries[number].count++;
}
@ -839,8 +810,6 @@ int Console_Disp()
Cursor_SetPosition(Cursor.x, Cursor.y);
Cursor_SetFlashMode(1);
Cursor_SetFlashStyle(alpha_shift_status); //Potential 2.00 OS incompatibilty (cf Simon's doc)
/*Bdisp_DrawLineVRAM(Cursor.x * 6, Cursor.y * 8, Cursor.x * 6, Cursor.y * 8 + 6);
Bdisp_DrawLineVRAM(Cursor.x * 6 + 1, Cursor.y * 8, Cursor.x * 6 + 1, Cursor.y * 8 + 6);*/
}
}
else