Merge branch 'q3k/fb2' into q3k/cube

epicardium/epicardium.h

@@ -266,6 +266,37 @@ enum disp_fillstyle {
   FILLSTYLE_FILLED = 1
 };
 
+/** Width of display in pixels */
+#define DISP_WIDTH 160
+
+/** Height of display in pixels */
+#define DISP_HEIGHT 80
+
+/** Raw framebuffer */
+struct disp_framebuffer {
+  /**
+   * The frambuffer stores pixels as RGB565, but byte swapped.
+   * That is, for every (x, y) coordinate, there are two uint8_ts
+   * storing 16 bits of pixel data.
+   *
+   * **Example: fill framebuffer with red**:
+   *
+   * .. code-block:: cpp
+   *
+   * 	struct disp_framebuffer *fb = epic_disp_framebuffer();
+   * 	uint16_t red = 0b1111100000000000;
+   * 	for (int y = 0; y < DISP_HEIGHT; y++) {
+   * 		for (int x = 0; x < DISP_WIDTH; x++) {
+   * 			fb->fb[y][x][0] = red & 0xFF;
+   * 			fb->fb[y][x][1] = red >> 8;
+   * 		}
+   * 	}
+   * 	epic_disp_update();
+   *
+   */
+  uint8_t fb[DISP_HEIGHT][DISP_WIDTH][2];
+};
+
 /**
  * Locks the display.
  *
@@ -289,7 +320,6 @@ API(API_DISP_CLOSE, int epic_disp_close());
  * to be shown on the display
  */
 API(API_DISP_UPDATE, int epic_disp_update());
-
 /**
  * Returns the back framebuffer (the display buffer that's currently inactive
  * that will be shown after the next call to ``epic_disp_update``.
@@ -417,6 +447,15 @@ API(API_DISP_CIRC,
 	    uint16_t pixelsize)
     );
 
+/**
+ * Returns the back framebuffer (the display buffer that's currently inactive
+ * that will be shown after the next call to ``epic_disp_update``.
+ *
+ * :returns: pointer to a framebuffer
+ */
+API(API_DISP_FRAMEBUFFER, struct disp_framebuffer *epic_disp_framebuffer());
+
+
 /**
  * Start continuous readout of the light sensor. Will read light level
  * at preconfigured interval and make it available via `epic_light_sensor_get()`.

epicardium/modules/display.c

@@ -125,9 +125,9 @@ int epic_disp_update()
 	}
 }
 
-uint16_t *epic_disp_framebuffer()
+struct disp_framebuffer *epic_disp_framebuffer()
 {
-	return (uint16_t*) LCD_Framebuffer();
+	return (struct disp_framebuffer*)LCD_Framebuffer();
 }
 
 int epic_disp_open()