summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@adafruit.com>2020-04-20 15:25:29 -0700
committerGitHub <noreply@github.com>2020-04-20 15:25:29 -0700
commita4d86b96fd1e60b807258a30cd765b48f0372b6d (patch)
treed8bf632df5a139a306265c2378d6853ddcc5bdfb
parent2c92befae177246b5edbac3b594d57c7f145dd22 (diff)
parent43022d829491b47710c2c1d9689239c2ea7f2a8a (diff)
Merge pull request #2777 from pewpew-game/master
Fix RGB/BGR colors in Stage
m---------frozen/circuitpython-stage0
-rw-r--r--ports/atmel-samd/boards/pewpew_m4/board.c5
-rw-r--r--ports/atmel-samd/boards/ugame10/board.c5
3 files changed, 6 insertions, 4 deletions
diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage
-Subproject 19a66d79f0650a15e502464b42e16692365eab3
+Subproject 0d2c083a2fb57a1562d4806775f45273abbfbfa
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
index cf8439cf0..bfec489e7 100644
--- 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
index 38661950f..d3a452119 100644
--- 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