From acfc67db6b8b0c05233e917f5dea13bb06fc14f6 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain@goyet.com>
Date: Mon, 11 May 2015 16:37:45 +0200
Subject: [PATCH] ili9341 initializes for RGB input

---
 platform/ili9341/ili9341.c    | 31 +++++++++++++++++++------------
 platform/ili9341/ili9341.h    |  2 +-
 platform/stm32f429/init_lcd.c |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/platform/ili9341/ili9341.c b/platform/ili9341/ili9341.c
index 1037eaada..c5e3a23da 100644
--- a/platform/ili9341/ili9341.c
+++ b/platform/ili9341/ili9341.c
@@ -45,21 +45,28 @@ static instruction_t initialisation_sequence[] = {
   COMMAND(FRMCTR1), DATA(0x00), DATA(0x1B),
   */
 
-  // Gamma
-  //FIXME
+  // Gamma //TODO
 
-  // Display
-  // RGB Interface mode //FIXME: explain
+  /* RGB Interface mode
+   *  DE is on "high enable"
+   *  DOTCLK polarity: data fetched at rising time
+   *  HSYNC polarity: low-level sync clock
+   *  VSYNC polarity: low-level sync clock
+   *  RCM: valid data is determined by DE signal */
   COMMAND(IFMODE), DATA(0xC0),
 
+
+  /* Interface control
+   *  DM(1): RGB interface mode
+   *  RM(1): RGB interface for writing to GRAM
+   *  RIM(0): 16/18bits RGB interface (1 transfer/pixel) */
   COMMAND(IFCTL), DATA(0x01), DATA(0x00), DATA(0x06),
 
-  // Entry mode set, skipped
+  // Sleep out, requires a 100ms delay
   COMMAND(SLPOUT), DELAY(100),
 
-  COMMAND(DISPON), DELAY(20),
-
-  COMMAND(NOP) // Used to mark the end of the init sequence
+  // Display on, requires a 20ms delay
+  COMMAND(DISPON), DELAY(20)
 };
 
 void perform_instruction(ili9341_t * c, instruction_t * instruction) {
@@ -73,14 +80,14 @@ void perform_instruction(ili9341_t * c, instruction_t * instruction) {
   }
 }
 
-void ili9341_initialize(ili9341_t * c, bool rgb) {
+void ili9341_initialize(ili9341_t * c) {
   // Falling edge on CSX
   c->chip_select_pin_write(0);
 
   // Send all the initialisation_sequence
-  instruction_t * instruction = initialisation_sequence;
-  while (!(instruction->mode == COMMAND_MODE && instruction->payload == NOP)) {
-    perform_instruction(c, instruction++);
+  size_t init_sequence_length = sizeof(initialisation_sequence)/sizeof(initialisation_sequence[0]);
+  for (int i=0; i<init_sequence_length;i++) {
+    perform_instruction(c, initialisation_sequence+i);
   }
 
 #define FILL_SCREEN_UPON_INIT 1
diff --git a/platform/ili9341/ili9341.h b/platform/ili9341/ili9341.h
index ba4e7feab..14fb4dc89 100644
--- a/platform/ili9341/ili9341.h
+++ b/platform/ili9341/ili9341.h
@@ -14,6 +14,6 @@ typedef struct {
   void (*spi_write)(char * data, size_t size);
 } ili9341_t;
 
-void ili9341_initialize(ili9341_t * controller, bool enable_rgb_interface);
+void ili9341_initialize(ili9341_t * controller);
 void ili9341_set_gamma(ili9341_t * controller);
 #endif
diff --git a/platform/stm32f429/init_lcd.c b/platform/stm32f429/init_lcd.c
index 93ec5f0f8..49025e4fc 100644
--- a/platform/stm32f429/init_lcd.c
+++ b/platform/stm32f429/init_lcd.c
@@ -298,7 +298,7 @@ static ili9341_t panel = {
 };
 
 static void init_panel() {
-  ili9341_initialize(&panel, 1);
+  ili9341_initialize(&panel);
 }
 
 static void spi_5_write(char * data, size_t size) {