new test main, cycles through all large fonts on button3

This commit is contained in:
Stefan `Sec` Zehl 2011-05-12 02:24:35 +02:00
parent cf27356102
commit 0f525a87f9
1 changed files with 44 additions and 6 deletions

50
main.c
View File

@ -18,9 +18,18 @@
void ReinvokeISP(void); void ReinvokeISP(void);
#include <lcd/smallfonts.h>
#include <lcd/veramono9.h>
#include <lcd/render.h> #include <lcd/render.h>
#include <lcd/smallfonts.h>
#include <lcd/dejavusans9.h>
#include <lcd/dejavusansbold9.h>
#include <lcd/dejavusanscondensed9.h>
#include <lcd/dejavusansmono8.h>
#include <lcd/dejavusansmonobold8.h>
#include <lcd/veramono11.h>
#include <lcd/veramono9.h>
#include <lcd/veramonobold11.h>
#include <lcd/veramonobold9.h>
/**************************************************************************/ /**************************************************************************/
@ -49,10 +58,12 @@ int main(void)
//pmuSleep(); //pmuSleep();
//pmuPowerDown(); //pmuPowerDown();
init(); // display init(); // display
/*
gpioSetDir(CFG_LED_PORT, CFG_LED_PIN, 0); gpioSetDir(CFG_LED_PORT, CFG_LED_PIN, 0);
IOCON_PIO1_11 = 0x41; IOCON_PIO1_11 = 0x41;
adcInit(); adcInit();
fill(0); */
fill(255);
display(0); display(0);
uint32_t j=0; uint32_t j=0;
@ -67,6 +78,7 @@ int main(void)
font_direction=FONT_DIR_LTR; // LeftToRight is the default font_direction=FONT_DIR_LTR; // LeftToRight is the default
font= &Font_8x8 ; font= &Font_8x8 ;
/*
DoString(0,yctr,"Hallo Welt"); DoString(0,yctr,"Hallo Welt");
yctr+=9; yctr+=9;
font= &Font_8x8Thin ; font= &Font_8x8Thin ;
@ -81,12 +93,15 @@ int main(void)
font= &Font_3x6; font= &Font_3x6;
DoString(0,yctr,"HALLO WELT"); DoString(0,yctr,"HALLO WELT");
yctr+=6; yctr+=6;
*/
yctr+=1; yctr+=1;
yctr=8;
/* Read & display serial number */ /* Read & display serial number */
#include "core/iap/iap.h" #include "core/iap/iap.h"
/*
IAP_return_t iap_return; IAP_return_t iap_return;
iap_return = iapReadSerialNumber(); iap_return = iapReadSerialNumber();
@ -100,31 +115,54 @@ int main(void)
dx=DoIntX(x,y,iap_return.Result[3]); y+=font->u8Height; dx=DoIntX(x,y,iap_return.Result[3]); y+=font->u8Height;
font= &Font_7x8; font= &Font_7x8;
}; };
*/
static FONT fonts[]=
{
& Font_dejaVu9pt,
& Font_dejaVuBold9pt,
& Font_dejaVuCondensed9pt,
& Font_dejaVuMono8pt,
& Font_dejaVuMonoBold8pt,
& Font_VeraMono11pt,
& Font_VeraMono9pt,
& Font_VeraMonoBold11pt,
& Font_VeraMonoBold9pt,
& Font_7x8
};
int fontctr=0;
while (1) while (1)
{ {
display(j); display(j);
delayms(10); delayms(10);
// Toggle LED once per second ... rollover = 136 years :) // Toggle LED once per second ... rollover = 136 years :)
/*
currentSecond = systickGetSecondsActive(); currentSecond = systickGetSecondsActive();
if (currentSecond != lastSecond){ if (currentSecond != lastSecond){
dx=DoString(0,yctr,"UP:"); dx=DoString(0,yctr,"UP:");
DoInt(dx,yctr,currentSecond); DoInt(dx,yctr,currentSecond);
}; };
// DoString(95,0,"Hallo Welt!"); */
font=fonts[fontctr];
DoString(1,yctr,"Hallo Welt!");
if(0 && gpioGetValue(3,3)==0){ if(1 && gpioGetValue(3,3)==0){
gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_ON); gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_ON);
while(gpioGetValue(3,3)==0); while(gpioGetValue(3,3)==0);
gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_OFF); gpioSetValue (CFG_LED_PORT, CFG_LED_PIN, CFG_LED_OFF);
yctr++; fill(255);
fontctr++;
if(fontctr>9)
fontctr=0;
}; };
/*
uint32_t results = adcRead(7); uint32_t results = adcRead(7);
dx=DoString(0,yctr+9,"LED:"); dx=DoString(0,yctr+9,"LED:");
DoInt(dx,yctr+9,results); DoInt(dx,yctr+9,results);
*/
/* /*
lastSecond = currentSecond; lastSecond = currentSecond;