projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add function to read hp ticks.
[bertos.git]
/
examples
/
lm3s1968
/
lm3s1968.c
diff --git
a/examples/lm3s1968/lm3s1968.c
b/examples/lm3s1968/lm3s1968.c
index f77f43e41a6da2e5983436c6de7f25d1a8d87b8d..d6bdb4cce9649a52eb017c0b1d083a40927117f3 100644
(file)
--- a/
examples/lm3s1968/lm3s1968.c
+++ b/
examples/lm3s1968/lm3s1968.c
@@
-66,7
+66,7
@@
static PROC_DEFINE_STACK(ser_stack, PROC_STACK_SIZE);
static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
#endif
static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
#endif
-extern Font font_
helvB10
;
+extern Font font_
gohu
;
static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
static Bitmap lcd_bitmap;
static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
static Bitmap lcd_bitmap;
@@
-250,14
+250,14
@@
static void context_switch_test(Bitmap *bm)
static void uptime(Bitmap *bm)
{
static void uptime(Bitmap *bm)
{
- extern const Font font_
ncenB18
;
+ extern const Font font_
luBS14
;
const Font *old_font;
old_font = bm->font;
/* Set big font */
gfx_bitmapClear(bm);
const Font *old_font;
old_font = bm->font;
/* Set big font */
gfx_bitmapClear(bm);
- gfx_setFont(bm, &font_
ncenB18
);
+ gfx_setFont(bm, &font_
luBS14
);
text_xprintf(bm, 0, 0, TEXT_FILL | TEXT_CENTER, "Uptime");
while (1)
{
text_xprintf(bm, 0, 0, TEXT_FILL | TEXT_CENTER, "Uptime");
while (1)
{
@@
-276,12
+276,12
@@
static void uptime(Bitmap *bm)
static void NORETURN soft_reset(Bitmap * bm)
{
static void NORETURN soft_reset(Bitmap * bm)
{
- extern const Font font_
ncenB18
;
+ extern const Font font_
luBS14
;
int i;
/* Set big font */
gfx_bitmapClear(bm);
int i;
/* Set big font */
gfx_bitmapClear(bm);
- gfx_setFont(bm, &font_
ncenB18
);
+ gfx_setFont(bm, &font_
luBS14
);
for (i = 5; i; --i)
{
text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "%d", i);
for (i = 5; i; --i)
{
text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "%d", i);
@@
-343,7
+343,7
@@
int main(void)
kputs("Init OLED display..");
rit128x96_init();
gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
kputs("Init OLED display..");
rit128x96_init();
gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
- gfx_setFont(&lcd_bitmap, &font_
helvB10
);
+ gfx_setFont(&lcd_bitmap, &font_
gohu
);
rit128x96_blitBitmap(&lcd_bitmap);
kputs("Done.\n");
kputs("Init Keypad..");
rit128x96_blitBitmap(&lcd_bitmap);
kputs("Done.\n");
kputs("Init Keypad..");