X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2Fbetty.h;h=07d063a01d512962796842f2696f0d18755db5db;hp=41b3687f507b144e9c61ef215b04090bba6b289a;hb=a409cb5b36482767f766ec9efc5dbecaa2274660;hpb=b4ca71fc214ba3c58cec25661ba1f81cf7b1b871

diff --git a/betty/betty.h b/betty/betty.h
index 41b3687..07d063a 100644
--- a/betty/betty.h
+++ b/betty/betty.h
@@ -20,35 +20,23 @@
 
 // api
 #include "system.h"
+#include "functions.h"
 #include "uart.h"
 #include "buttons.h"
 #include "spi.h"
 #include "display.h"
+#include "flash.h"
+#include "pffs.h"
+#include "interrupts.h"
+
+// font/logo
+#include "default_font.h"
+#include "default_logo.h"
 
 /*
  * defines
  */
 
-/* bank 0/2 and boootloader addr/size */
-#define BANK0			0x80000000
-#define BANK1			0x81000000
-#define BANK2			0x82000000
-#define BANK_SIZE		0x00100000
-#define BOOTLOADER		0x7fffe000
-#define BL_SIZE			0x00002000
-
-/* flash cmd addresses - flash[0-18] <--> arm[1-19]*/
-#define B0F555	(*((volatile unsigned short *)(BANK0|0xaaa)))	// 0x555
-#define B0F2AA	(*((volatile unsigned short *)(BANK0|0x554)))	// 0x2aa
-#define B0F	(*((volatile unsigned short *)(BANK0)))
-#define B2F555	(*((volatile unsigned short *)(BANK2|0xaaa)))	// 0x555
-#define B2F2AA	(*((volatile unsigned short *)(BANK2|0x554)))	// 0x2aa
-#define B2F	(*((volatile unsigned short *)(BANK2)))
-
-/* lcd command and data addresses */
-#define LCD_CMD		(*((volatile unsigned char *)(BANK1)))
-#define LCD_DATA	(*((volatile unsigned char *)(BANK1+1)))
-
  /*
   * function prototypes
   */