ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Saner code.

This commit is contained in:
Stefan `Sec` Zehl 2011-08-02 00:03:37 +02:00
parent 162fd9775c
commit 623582bbb4
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/basic/menu.c
View File

@ -2,7 +2,6 @@
#include "basic/basic.h" #include "basic/basic.h"
#include "lcd/render.h"
#include "lcd/print.h" #include "lcd/print.h"
/**************************************************************************/ /**************************************************************************/
@ -16,11 +15,11 @@ void handleMenu(const struct MENU *the_menu) {
if (the_menu == NULL) return; if (the_menu == NULL) return;
// font = &Font_7x8; // Font needs to be set externally? setSystemFont();
for (numentries = 0; the_menu->entries[numentries] != NULL; numentries++); for (numentries = 0; the_menu->entries[numentries] != NULL; numentries++);
visible_lines = (RESY/getFontHeight())-1; // subtract title line visible_lines = lcdGetVisibleLines()-1; // subtract title line
#ifdef SAFETY #ifdef SAFETY
if (visible_lines < 2) return; if (visible_lines < 2) return;
#endif #endif
@ -75,7 +74,7 @@ void handleMenu(const struct MENU *the_menu) {
getInputWaitRelease(); getInputWaitRelease();
if (the_menu->entries[menuselection]->callback!=NULL) if (the_menu->entries[menuselection]->callback!=NULL)
the_menu->entries[menuselection]->callback(); the_menu->entries[menuselection]->callback();
lcdDisplay(); lcdRefresh();
getInputWait(); getInputWait();
break; break;

11
firmware/lcd/print.c
View File

@ -2,6 +2,7 @@
#include <render.h> #include <render.h>
#include <fonts.h> #include <fonts.h>
#include <print.h> #include <print.h>
#include <fonts/smallfonts.h>
int x=0; int x=0;
int y=0; int y=0;
@ -69,3 +70,13 @@ void lcdSetCrsr(int dx,int dy){
void lcdSetCrsrX(int dx){ void lcdSetCrsrX(int dx){
x=dx; x=dx;
}; };
void setSystemFont(void){
setIntFont(&Font_7x8);
};
int lcdGetVisibleLines(void){
return (RESY/getFontHeight()); // subtract title line
};

3
firmware/lcd/print.h
View File

@ -10,4 +10,5 @@ void lcdRefresh();
void lcdMoveCrsr(signed int dx,signed int dy); void lcdMoveCrsr(signed int dx,signed int dy);
void lcdSetCrsr(int dx,int dy); void lcdSetCrsr(int dx,int dy);
void lcdSetCrsrX(int dx); void lcdSetCrsrX(int dx);
void setSystemFont(void);
int lcdGetVisibleLines(void);