Merge git://github.com/r0ket/r0ket

firmware/.gitignore

@@ -4,3 +4,5 @@ lpc1xxx/memory.ld
 applications/wrapper.c
 lcd/allfonts.h
 Makefile.dep
+table.c
+table.h

firmware/l0dable/.gitignore

@@ -1,4 +1,4 @@
 *.elf
 *.bin
-*.h
+usetable.h
 loadable.ld

firmware/l0dable/Makefile

@@ -42,7 +42,7 @@ $(LDFILE):
 	$(OBJCOPY) $(OCFLAGS) -O binary $< $@
 
 clean:
-	rm -f *.o *.elf *.bin
+	rm -f *.o *.elf *.bin usetable.h
 
 IDIR=/cygdrive/f
 install:
@@ -50,6 +50,9 @@ install:
 
 $(OBJS): usetable.h
 
+usetable.h:
+	./mktable.pl
+
 .SUFFIXES:
 
 .PHONY: $(LDFILE)

firmware/l0dable/debug.c

@@ -65,9 +65,9 @@ void ChkBattery(void) {
         lcdNl();
         lcdPrintln("Chrg_stat:");
         if(gpioGetValue(RB_PWR_CHRG)){
-            lcdPrintln("1");
+            lcdPrintln("not charging");
         }else{
-            lcdPrintln("0");
+            lcdPrintln("    CHARGING");
         };
         lcdRefresh();
         delayms_queue(100);

firmware/lcd/render.c

@@ -8,13 +8,14 @@
 #include "fonts/smallfonts.h"
 
 #include "filesystem/ff.h"
+#include "render.h"
 
 /* Global Variables */
 const struct FONT_DEF * font = NULL;
 
 struct EXTFONT efont;
 
-FIL file; /* current font file */
+static FIL file; /* current font file */
 
 /* Exported Functions */
 
@@ -40,6 +41,13 @@ int getFontHeight(void){
     return 8; // XXX: Should be done right.
 };
 
+static uint8_t read_byte (void)
+{
+  UINT    readbytes;
+  uint8_t byte;
+  f_read(&file, &byte, sizeof(uint8_t), &readbytes);
+  return byte;
+}
 
 int _getFontData(int type, int offset){
     UINT readbytes;
@@ -51,10 +59,10 @@ int _getFontData(int type, int offset){
     if(efont.type == FONT_EXTERNAL){
 
     if (type == START_FONT){
-        res = f_read(&file, &efont.def.u8Width, sizeof(uint8_t), &readbytes);
+        efont.def.u8Width = read_byte ();
-        res = f_read(&file, &efont.def.u8Height, sizeof(uint8_t), &readbytes);
+        efont.def.u8Height = read_byte ();
-        res = f_read(&file, &efont.def.u8FirstChar, sizeof(uint8_t), &readbytes);
+        efont.def.u8FirstChar = read_byte ();
-        res = f_read(&file, &efont.def.u8LastChar, sizeof(uint8_t), &readbytes);
+        efont.def.u8LastChar = read_byte ();
         res = f_read(&file, &extras, sizeof(uint16_t), &readbytes);
         return 0;
     };
@@ -72,9 +80,7 @@ int _getFontData(int type, int offset){
         return 0;
     };
     if(type == GET_WIDTH || type == GET_DATA){
-        uint8_t width;
+        return read_byte ();
-        res = f_read(&file, &width, sizeof(uint8_t), &readbytes);
-        return width;
     };
     if(type == SEEK_DATA){
         character=offset;
@@ -87,7 +93,7 @@ int _getFontData(int type, int offset){
     };
     if(type == PEEK_DATA){
         uint8_t width;
-        res = f_read(&file, &width, sizeof(uint8_t), &readbytes);
+        width = read_byte ();
         f_lseek(&file,6+
                 (extras*sizeof(uint16_t))+
                 ((extras+font->u8LastChar-font->u8FirstChar)*sizeof(uint8_t))+
@@ -138,7 +144,7 @@ int _getFontData(int type, int offset){
     return 0;
 };
 
-int _getIndex(int c){
+static int _getIndex(int c){
 #define ERRCHR (font->u8FirstChar+1)
     /* Does this font provide this character? */
     if(c<font->u8FirstChar)
@@ -240,10 +246,10 @@ int DoChar(int sx, int sy, int c){
                 UINT res;
                 UINT readbytes;
                 uint8_t testbyte;
-                res = f_read(&file, &testbyte, sizeof(uint8_t), &readbytes);
+                testbyte = read_byte ();
                 if(testbyte>>4 ==15){
-                    res = f_read(&file, &preblank, sizeof(uint8_t), &readbytes);
+                    preblank = read_byte ();
-                    res = f_read(&file, &postblank, sizeof(uint8_t), &readbytes);
+                    postblank = read_byte ();
                     width-=3;
                     width/=height;
                     res = f_read(&file, charBuf, width*height, &readbytes);