Merge pull request #2777 from pewpew-game/master

tannewt · web-flow · commit a4d86b96fd1e · 2020-04-20T15:25:29.000-07:00
Fix RGB/BGR colors in Stage
diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
@@ -1 +1 @@
-Subproject commit 19a66d79f0650a15e502464b42e16692365eab36
+Subproject commit 0d2c083a2fb57a1562d4806775f45273abbfbfae
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries, 2020 Radomir
+ * Dopieralski
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -79,7 +80,7 @@ uint8_t display_init_sequence[] = {
     0xc4, 2, 0x8a, 0xee,
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
-    0x36, 1, 0xa8, // _MADCTL
+    0x36, 1, 0xa0, // _MADCTL
     // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color
diff --git a/ports/atmel-samd/boards/ugame10/board.c b/ports/atmel-samd/boards/ugame10/board.c
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries, 2020 Radomir
+ * Dopieralski
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +53,7 @@ uint8_t display_init_sequence[] = {
     0xc4, 2, 0x8a, 0xee,
     0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
     0x2a, 0, // _INVOFF
-    0x36, 1, 0xa0, // _MADCTL bottom to top refresh
+    0x36, 1, 0xa8, // _MADCTL bottom to top refresh
     // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
     // fix on VTL
     0x3a, 1, 0x05, // COLMOD - 16bit color

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`*`
`4`	`4`	`* The MIT License (MIT)`
`5`	`5`	`*`
`6`		`- * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries`
	`6`	`+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries, 2020 Radomir`
	`7`	`+ * Dopieralski`
`7`	`8`	`*`
`8`	`9`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`9`	`10`	`* of this software and associated documentation files (the "Software"), to deal`
`@@ -79,7 +80,7 @@ uint8_t display_init_sequence[] = {`
`79`	`80`	`0xc4, 2, 0x8a, 0xee,`
`80`	`81`	`0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V`
`81`	`82`	`0x2a, 0, // _INVOFF`
`82`		`- 0x36, 1, 0xa8, // _MADCTL`
	`83`	`+ 0x36, 1, 0xa0, // _MADCTL`
`83`	`84`	`// 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,`
`84`	`85`	`// fix on VTL`
`85`	`86`	`0x3a, 1, 0x05, // COLMOD - 16bit color`