[Horus] GUI continued

2016-02-25 23:14:58 +01:00
parent 83887f1532
commit 2b9242fac2
70 changed files with 1770 additions and 1474 deletions
@@ -38,7 +38,7 @@ bool loadModelBitmap(char * name, uint8_t * bitmap)
    char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
    strncpy(lfn+sizeof(BITMAPS_PATH), name, len);
    strcpy(lfn+sizeof(BITMAPS_PATH)+len, BITMAPS_EXT);
-    if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
+    if (lcdLoadBitmap(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
      return true;
    }
  }
@@ -2606,7 +2606,7 @@ int main(void)
  // lcdSetRefVolt(25);
 #endif

-#if defined(PCBTARANIS)
+#if defined(PCBTARANIS) || defined(PCBHORUS)
  drawSplash();
 #endif