Skip to content

Commit

Permalink
updates...
Browse files Browse the repository at this point in the history
  • Loading branch information
olikraus committed Aug 19, 2013
1 parent fdcdd60 commit 4a23bca
Show file tree
Hide file tree
Showing 5 changed files with 324 additions and 0 deletions.
45 changes: 45 additions & 0 deletions doc/device.table
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2018,6 +2018,51 @@ n.a.
n.a.
::
:Controller
A2 Micro Printer
:Display/Size
384x240
:Mode
BW
:Set Contrast
n.a.
:Page Size
384 Bytes
:Com
:Device
<tt>u8g_dev_a2_micro_printer_384x240</tt>
:C++ Constructor
n.a.
:Arduino
impl. v1.14
:Arduino Due
impl. v1.14
:Chipkit
impl. v1.14
:AVR
impl. v1.14
:Display/Size
192x120
:Mode
BW
:Set Contrast
n.a.
:Page Size
192 Bytes
:Com
:Device
<tt>u8g_dev_a2_micro_printer_192x120_ds</tt>
:C++ Constructor
n.a.
:Arduino
impl. v1.14
:Arduino Due
impl. v1.14
:Chipkit
impl. v1.14
:AVR
impl. v1.14
::
:Controller
callback fn
:Display/Size
Flipdisk, 28x14
Expand Down
52 changes: 52 additions & 0 deletions sys/lpc11xx/gps/gps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,52 @@

#define SYS_TICK_PERIOD_IN_MS 10


/*============================================================*/
/* LPC11xx BOD Monitor: Try to guess external voltage with the BOD interrupts */
/*
*/

/*
level 0: below 2.22 Volt
level 1: between 2.22 Volt and between 2.52 Volt
level 2: between 2.52 Volt and 2.80 Volt
level 3: above 2.80 Volt
*/
uint8_t battery_level;

/*
level 0: disable irq
level 1: 2.22 Volt
level 2: 2.52 Volt
level 3: 2.80 Volt
*/
void BODSetThreshold(uint8_t level)
{
NVIC_DisableIRQ(BOD_IRQn);
NVIC_ClearPendingIRQ(BOD_IRQn);
level &= 3;
level <<= 2;
LPC_SYSCON->BODCTRL = level; /* threshold 2.80 */
if ( level > 0 )
NVIC_EnableIRQ(BOD_IRQn);
}

void BODMonitorInit(void)
{
battery_level = 3;
BODSetThreshold(battery_level);
}


void __attribute__ ((interrupt)) BOD_Handler(void)
{
if ( battery_level >= 0 )
BODSetThreshold(battery_level);
}



/*============================================================*/
pq_t pq;

Expand Down Expand Up @@ -109,6 +155,7 @@ int UARTReadData(void)
volatile int16_t uart_data;
volatile int32_t uart_byte_cnt = 0;
volatile int32_t uart_avg_byte_cnt = 0;

void __attribute__ ((interrupt)) UART_Handler(void)
{
uint32_t iir = LPC_UART->IIR;
Expand Down Expand Up @@ -171,6 +218,7 @@ void SystemInit()
UARTInit(0);
#endif

BODMonitorInit();
}


Expand Down Expand Up @@ -450,8 +498,12 @@ void picloop_gps_speed(void)
u8g_SetFont(&u8g, u8g_font_4x6r);
u8g_DrawStr(&u8g, 0, 62, "Sat:");
u8g_DrawStr(&u8g, 20, 62, u8g_u8toa(pq.sat_cnt, 3));
/*
u8g_DrawStr(&u8g, 51, 62, "Quality:");
u8g_DrawStr(&u8g, 90, 62, u8g_u8toa(pq.gps_quality, 2));
*/
u8g_DrawStr(&u8g, 51, 62, "Battery:");
u8g_DrawStr(&u8g, 90, 62, u8g_u8toa(battery_level, 1));

} while ( u8g_NextPage(&u8g) );

Expand Down
1 change: 1 addition & 0 deletions sys/lpc11xx/gps/pq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ struct _pq_struct
typedef struct _pq_struct pq_t;

void pq_Init(pq_t *pq);
void pq_AddChar(pq_t *pq, uint8_t c);
void pq_DeleteFirst(pq_t *pq);
void pq_AddInterfaceValuesToQueue(pq_t *pq);
pq_entry_t *pq_GetLatestEntry(pq_t *pq);
Expand Down
12 changes: 12 additions & 0 deletions sys/sdl/greek/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CFLAGS = -g -Wall -I../../../csrc/. -DU8G_16BIT `sdl-config --cflags`

SRC = $(shell ls ../../../csrc/*.c) $(shell ls ../../../sfntsrc/*.c ) main.c ../dev/u8g_dev_sdl.c

OBJ = $(SRC:.c=.o)

helloworld: $(OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) `sdl-config --libs` -o u8g_sdl

clean:
-rm $(OBJ) u8g_sdl

214 changes: 214 additions & 0 deletions sys/sdl/greek/main.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@


#include "u8g.h"
#include <stdlib.h>
#include <stdio.h>


int u8g_sdl_get_key(void);


/*
Fontname: -ETL-Fixed-Medium-R-Normal--14-140-72-72-C-70-ISO8859-7
Copyright: Public domain font. Share and enjoy.
Capital A Height: 9, '1' Height: 9
Calculated Max Values w= 7 h=13 x= 3 y=12 dx= 7 dy= 0 ascent=12 len=13
Font Bounding box w= 7 h=14 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 9 descent=-2
X Font ascent =10 descent=-2
Max Font ascent =12 descent=-2
*/
#include "u8g.h"
const u8g_fntpgm_uint8_t etl14[2708] U8G_FONT_SECTION("etl14") = {
0,7,14,0,254,9,1,207,3,162,32,254,254,12,254,10,
254,0,0,0,7,0,12,1,9,9,7,3,0,128,128,128,
128,128,128,0,128,128,5,4,4,7,1,6,216,72,72,144,
6,9,9,7,1,0,36,36,252,72,72,72,252,144,144,6,
10,10,7,1,255,16,120,148,144,80,56,148,148,120,16,6,
9,9,7,1,0,100,148,152,112,32,56,100,164,152,6,9,
9,7,1,0,48,72,72,48,100,148,136,152,100,2,4,4,
7,2,6,192,64,64,128,3,11,11,7,3,255,32,64,64,
128,128,128,128,128,64,64,32,3,11,11,7,1,255,128,64,
64,32,32,32,32,32,64,64,128,5,7,7,7,1,1,32,
168,112,32,112,168,32,5,7,7,7,1,1,32,32,32,248,
32,32,32,2,4,4,7,3,254,192,64,64,128,5,1,1,
7,1,4,248,2,2,2,7,3,0,192,192,5,9,9,7,
1,0,8,8,16,16,32,64,64,128,128,6,9,9,7,1,
0,48,72,132,132,132,132,132,72,48,5,9,9,7,1,0,
32,96,160,32,32,32,32,32,248,6,9,9,7,1,0,120,
132,132,4,24,32,64,128,252,6,9,9,7,1,0,120,132,
132,4,56,4,132,132,120,6,9,9,7,1,0,8,24,40,
40,72,136,252,8,8,6,9,9,7,1,0,252,128,128,248,
4,4,4,132,120,6,9,9,7,1,0,120,132,128,128,248,
132,132,132,120,6,9,9,7,1,0,252,4,8,8,16,16,
32,32,32,6,9,9,7,1,0,120,132,132,132,120,132,132,
132,120,6,9,9,7,1,0,120,132,132,132,124,4,132,132,
120,2,7,7,7,3,0,192,192,0,0,0,192,192,2,9,
9,7,3,254,192,192,0,0,0,192,64,64,128,4,7,7,
7,2,0,16,32,64,128,64,32,16,5,4,4,7,1,2,
248,0,0,248,4,7,7,7,2,0,128,64,32,16,32,64,
128,6,9,9,7,1,0,120,132,132,8,16,16,0,16,16,
6,9,9,7,1,0,56,68,156,164,164,164,156,64,60,6,
9,9,7,1,0,48,72,132,132,252,132,132,132,132,6,9,
9,7,1,0,248,68,68,68,120,68,68,68,248,6,9,9,
7,1,0,120,132,132,128,128,128,132,132,120,6,9,9,7,
1,0,248,68,68,68,68,68,68,68,248,6,9,9,7,1,
0,252,128,128,128,248,128,128,128,252,6,9,9,7,1,0,
252,128,128,128,248,128,128,128,128,6,9,9,7,1,0,120,
132,128,128,156,132,132,140,116,6,9,9,7,1,0,132,132,
132,132,252,132,132,132,132,5,9,9,7,1,0,248,32,32,
32,32,32,32,32,248,6,9,9,7,1,0,28,8,8,8,
8,8,136,136,112,6,9,9,7,1,0,132,136,144,160,192,
160,144,136,132,6,9,9,7,1,0,128,128,128,128,128,128,
128,128,252,6,9,9,7,1,0,132,204,204,180,180,132,132,
132,132,6,9,9,7,1,0,196,196,164,164,148,148,140,140,
132,6,9,9,7,1,0,120,132,132,132,132,132,132,132,120,
6,9,9,7,1,0,248,132,132,132,248,128,128,128,128,6,
11,11,7,1,254,120,132,132,132,132,228,148,140,120,8,4,
6,9,9,7,1,0,248,132,132,132,248,144,136,132,132,6,
9,9,7,1,0,120,132,128,96,24,4,132,132,120,7,9,
9,7,0,0,254,16,16,16,16,16,16,16,16,6,9,9,
7,1,0,132,132,132,132,132,132,132,132,120,6,9,9,7,
1,0,132,132,132,72,72,72,48,48,48,6,9,9,7,1,
0,132,132,132,132,180,180,204,204,132,6,9,9,7,1,0,
132,132,72,72,48,72,72,132,132,5,9,9,7,1,0,136,
136,136,136,80,32,32,32,32,6,9,9,7,1,0,252,4,
8,16,32,64,128,128,252,3,11,11,7,3,255,224,128,128,
128,128,128,128,128,128,128,224,5,9,9,7,1,0,128,128,
64,64,32,16,16,8,8,3,11,11,7,1,255,224,32,32,
32,32,32,32,32,32,32,224,6,3,3,7,1,8,48,72,
132,7,1,1,7,0,255,254,2,4,4,7,3,6,192,128,
128,64,6,7,7,7,1,0,120,132,28,100,132,140,116,6,
9,9,7,1,0,128,128,184,196,132,132,132,196,184,6,7,
7,7,1,0,120,132,128,128,128,132,120,6,9,9,7,1,
0,4,4,116,140,132,132,132,140,116,6,7,7,7,1,0,
120,132,132,252,128,132,120,5,9,9,7,1,0,24,32,32,
248,32,32,32,32,32,6,9,9,7,1,254,116,136,136,136,
112,64,184,132,120,6,9,9,7,1,0,128,128,184,196,132,
132,132,132,132,5,10,10,7,1,0,32,32,0,96,32,32,
32,32,32,248,5,12,12,7,1,254,8,8,0,24,8,8,
8,8,8,136,136,112,5,9,9,7,1,0,128,128,136,144,
160,192,160,144,136,5,9,9,7,1,0,96,32,32,32,32,
32,32,32,248,5,7,7,7,1,0,208,168,168,168,168,168,
136,6,7,7,7,1,0,184,196,132,132,132,132,132,6,7,
7,7,1,0,120,132,132,132,132,132,120,6,9,9,7,1,
254,184,196,132,132,132,196,184,128,128,6,9,9,7,1,254,
116,140,132,132,132,140,116,4,4,6,7,7,7,1,0,184,
196,132,128,128,128,128,6,7,7,7,1,0,120,132,128,120,
4,132,120,6,9,9,7,1,0,32,32,248,32,32,32,32,
36,24,6,7,7,7,1,0,132,132,132,132,132,140,116,5,
7,7,7,1,0,136,136,136,80,80,32,32,5,7,7,7,
1,0,136,168,168,168,168,168,80,5,7,7,7,1,0,136,
136,80,32,80,136,136,6,9,9,7,1,254,132,132,132,132,
140,116,4,4,120,6,7,7,7,1,0,252,8,16,32,64,
128,252,3,11,11,7,3,255,96,128,128,64,64,128,64,64,
128,128,96,1,13,13,7,3,254,128,128,128,128,128,128,128,
128,128,128,128,128,128,3,11,11,7,1,255,192,32,32,64,
64,32,64,64,32,32,192,6,2,2,7,1,7,100,152,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
0,0,0,7,0,12,2,4,4,7,2,6,192,64,64,128,
2,4,4,7,3,6,192,128,128,64,5,9,9,7,1,0,
48,72,64,64,240,64,64,240,72,255,255,1,10,10,7,3,
0,128,128,128,128,0,0,128,128,128,128,5,10,10,7,1,
0,112,136,128,112,136,136,112,8,136,112,4,2,2,7,2,
9,144,144,6,11,11,7,1,0,120,132,180,204,196,196,196,
204,180,132,120,255,6,7,7,7,1,0,20,40,80,160,80,
40,20,5,4,4,7,0,0,248,8,8,8,5,1,1,7,
1,4,248,255,4,1,1,7,2,11,240,4,3,3,7,2,
9,96,144,96,5,7,7,7,1,0,32,32,248,32,32,0,
248,4,7,7,7,2,4,96,144,16,32,64,128,240,4,7,
7,7,2,4,96,144,16,96,16,144,96,1,3,3,7,3,
9,128,128,128,5,5,5,7,1,7,32,32,32,136,136,7,
12,12,7,0,0,128,128,128,24,24,36,36,60,66,66,66,
66,3,3,3,7,2,3,64,224,64,7,12,12,7,0,0,
128,128,128,126,64,64,64,124,64,64,64,126,7,12,12,7,
0,0,128,128,128,66,66,66,66,126,66,66,66,66,6,12,
12,7,0,0,128,128,128,124,16,16,16,16,16,16,16,124,
6,7,7,7,1,0,160,80,40,20,40,80,160,7,12,12,
7,0,0,128,128,128,60,66,66,66,66,66,66,66,60,6,
10,10,7,1,0,64,196,72,72,80,40,52,68,136,156,6,
12,12,7,0,0,128,128,128,68,68,68,68,40,16,16,16,
16,7,12,12,7,0,0,128,128,128,60,66,66,66,66,66,
36,24,126,5,11,11,7,1,1,32,32,32,136,136,32,32,
32,32,32,24,6,9,9,7,1,0,48,48,72,72,120,132,
132,132,132,6,9,9,7,1,0,248,68,68,68,120,68,68,
68,248,6,9,9,7,1,0,252,128,128,128,128,128,128,128,
128,6,9,9,7,1,0,48,48,72,72,72,132,132,132,252,
6,9,9,7,1,0,252,128,128,128,248,128,128,128,252,6,
9,9,7,1,0,252,4,8,16,32,64,128,128,252,6,9,
9,7,1,0,132,132,132,132,252,132,132,132,132,6,9,9,
7,1,0,120,132,132,132,252,132,132,132,120,5,9,9,7,
1,0,248,32,32,32,32,32,32,32,248,6,9,9,7,1,
0,132,136,144,160,192,160,144,136,132,6,9,9,7,1,0,
48,48,72,72,72,132,132,132,132,6,9,9,7,1,0,132,
204,204,180,180,132,132,132,132,6,9,9,7,1,0,196,196,
164,164,148,148,140,140,132,6,9,9,7,1,0,252,0,0,
0,120,0,0,0,252,6,9,9,7,1,0,120,132,132,132,
132,132,132,132,120,7,9,9,7,0,0,254,68,68,68,68,
68,68,68,68,6,9,9,7,1,0,248,132,132,132,248,128,
128,128,128,255,6,9,9,7,1,0,252,128,64,32,16,32,
64,128,252,7,9,9,7,0,0,254,16,16,16,16,16,16,
16,16,5,9,9,7,1,0,136,136,136,136,80,32,32,32,
32,5,9,9,7,1,0,248,32,112,168,168,168,112,32,248,
6,9,9,7,1,0,132,132,72,72,48,72,72,132,132,5,
9,9,7,1,0,168,168,168,168,112,32,32,32,32,6,9,
9,7,1,0,120,132,132,132,132,132,72,48,252,5,12,12,
7,1,0,80,80,0,248,32,32,32,32,32,32,32,248,5,
12,12,7,1,0,80,80,0,136,136,136,136,80,32,32,32,
32,6,11,11,7,1,0,32,32,32,0,100,148,136,136,136,
148,100,5,11,11,7,1,0,32,32,32,0,120,128,128,240,
128,128,120,6,13,13,7,1,254,32,32,32,0,184,196,132,
132,132,132,132,4,4,3,11,11,7,3,0,128,128,128,0,
128,128,128,128,128,128,96,6,12,12,7,1,0,32,32,32,
136,136,0,132,132,132,132,132,120,6,7,7,7,1,0,100,
148,136,136,136,148,100,6,11,11,7,1,254,112,136,136,136,
248,132,132,132,248,128,128,6,8,8,7,1,255,196,36,40,
24,16,16,32,32,6,9,9,7,1,0,56,64,64,48,72,
132,132,132,120,5,7,7,7,1,0,120,128,128,240,128,128,
120,5,11,11,7,1,254,128,128,112,32,64,64,128,128,112,
8,112,6,9,9,7,1,254,184,196,132,132,132,132,132,4,
4,6,9,9,7,1,0,48,72,132,132,252,132,132,72,48,
3,7,7,7,3,0,128,128,128,128,128,128,96,5,7,7,
7,1,0,136,144,160,192,160,144,136,6,9,9,7,1,0,
192,32,32,16,16,40,72,68,132,6,9,9,7,1,254,132,
132,132,132,204,180,132,128,128,6,7,7,7,1,0,132,132,
136,136,144,160,192,6,11,11,7,1,254,128,128,120,128,128,
120,128,128,120,4,56,6,7,7,7,1,0,120,132,132,132,
132,132,120,6,7,7,7,1,0,252,72,72,72,72,72,72,
6,9,9,7,1,254,120,132,132,132,132,196,184,128,128,6,
9,9,7,1,254,56,64,128,128,128,64,56,4,120,6,7,
7,7,1,0,124,136,136,136,136,136,112,6,7,7,7,1,
0,252,32,32,32,32,32,24,6,7,7,7,1,0,132,132,
132,132,132,132,120,5,9,9,7,1,254,112,168,168,168,168,
168,112,32,32,5,9,9,7,1,254,136,136,80,80,32,80,
80,136,136,5,11,11,7,1,254,32,32,168,168,168,168,168,
168,112,32,32,6,7,7,7,1,0,72,132,132,132,148,148,
104,4,10,10,7,2,0,160,160,0,64,64,64,64,64,64,
48,6,10,10,7,1,0,72,72,0,132,132,132,132,132,132,
120,6,11,11,7,1,0,32,32,32,0,120,132,132,132,132,
132,120,6,11,11,7,1,0,32,32,32,0,132,132,132,132,
132,132,120,6,11,11,7,1,0,32,32,32,0,72,132,132,
132,148,148,104};


int main(void)
{

u8g_t u8g;
u8g_Init(&u8g, &u8g_dev_sdl_1bit);
u8g_FirstPage(&u8g);

do
{
u8g_SetFont(&u8g, etl14);
// CAPITAL GREEK LETTER ALPHA, dec 193 oct 301 hex c1
// SMALL GREEK LETTER ALPHA, dec 225 oct 341 hex e1
u8g_DrawStr(&u8g, 0, 20, "A:\301 a:\341");
} while( u8g_NextPage(&u8g) );

while( u8g_sdl_get_key() < 0 )
;
}

0 comments on commit 4a23bca

Please sign in to comment.