Fix built-in inits and terminal allocate

tannewt · tannewt · commit 03068a93884e · 2019-02-01T01:00:10.000-08:00
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -85,10 +85,12 @@ void board_init(void) {
         128, // Height
         2, // column start
         1, // row start
+        0, // rotation
         16, // Color depth
         MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
         MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
         MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
+        0x37, // set vertical scroll command
         display_init_sequence,
         sizeof(display_init_sequence),
         &pin_PA00);
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
@@ -48,11 +48,11 @@ uint8_t display_init_sequence[] = {
     0xc1, 1, 0x10,             // Power control SAP[2:0];BT[3:0]
     0xc5, 2, 0x3e, 0x28,       // VCM control
     0xc7, 1, 0x86,             // VCM control2
-    0x36, 1, 0x38,             // Memory Access Control
+    0x36, 1, 0x08,             // Memory Access Control
     0x37, 1, 0x00,             // Vertical scroll zero
     0x3a, 1, 0x55,             // COLMOD: Pixel Format Set
     0xb1, 2, 0x00, 0x18,       // Frame Rate Control (In Normal Mode/Full Colors)
-    0xb6, 3, 0x08, 0x82, 0x27, // Display Function Control
+    0xb6, 3, 0x08, 0xa2, 0x27, // Display Function Control
     0xF2, 1, 0x00,                         // 3Gamma Function Disable
     0x26, 1, 0x01,             // Gamma curve selected
     0xe0, 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
@@ -82,10 +82,12 @@ void board_init(void) {
         240, // Height
         0, // column start
         0, // row start
+        90, // rotation
         16, // Color depth
         MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
         MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
         MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
+        0x37, // Set vertical scroll command
         display_init_sequence,
         sizeof(display_init_sequence),
         &pin_PB31);
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
@@ -55,7 +55,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     uint16_t total_tiles = width_in_tiles * height_in_tiles;
 
     // First try to allocate outside the heap. This will fail when the VM is running.
-    tilegrid_tiles = allocate_memory(total_tiles, false);
+    tilegrid_tiles = allocate_memory(align32_size(total_tiles), false);
     uint8_t* tiles;
     if (tilegrid_tiles == NULL) {
         tiles = m_malloc(total_tiles, true);
