Skip to content

Commit a7f3bf2

Browse files
Hannes7eicherHannes7eicher
authored
Testing and adjusting examples
* Testing and adjusting examples - adjusted display examples to fit round display - renamed strandtest to LED_Blink - changed Qtouch button layout for improved usability - add check for board revision
1 parent 404ecf2 commit a7f3bf2

File tree

5 files changed

+39
-83
lines changed

5 files changed

+39
-83
lines changed

‎examples/Display/Compose_images/Compose_images.ino‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,13 @@ void loop() {
3535
carrier.display.fillScreen(ST77XX_BLACK);
3636
drawArduino(0x04B3);
3737
fadeLoop();
38-
carrier.display.fillScreen(ST77XX_BLACK);
39-
drawEIoT();
40-
fadeLoop();
41-
4238
carrier.display.fillScreen(ST77XX_WHITE);
4339
drawArduino(0x0000);
4440
fadeLoop();
45-
4641
drawArduino(0xF324);
4742
fadeLoop();
4843
drawArduino(0x04B3);
4944
fadeLoop();
50-
51-
carrier.display.fillScreen(ST77XX_WHITE);
52-
drawEIoT();
53-
fadeLoop();
5445
}
5546

5647
//Fading Orange loop
@@ -72,17 +63,8 @@ void fadeLoop() {
7263

7364
}
7465

75-
//Compose the differentn parts of the image
76-
void drawEIoT() {
77-
carrier.display.drawBitmap(44, 25, ArduinoLogo, 152, 72, 0x04B3);
78-
carrier.display.drawBitmap(48, 110, ArduinoText, 144, 23, 0x04B3);
79-
carrier.display.drawBitmap(0, 150, ExploreFrame, 240, 75, 0xF324);
80-
carrier.display.drawBitmap(0, 150, ExplreIoTKittext, 240, 75, 0x04B3);
81-
carrier.display.drawBitmap(0, 150, ExploreIoTtext, 240, 75, 0xFFFF);
82-
}
83-
8466
//Same with the Arduino Logo and the text
8567
void drawArduino(uint16_t color) {
8668
carrier.display.drawBitmap(44, 60, ArduinoLogo, 152, 72, color);
8769
carrier.display.drawBitmap(48, 145, ArduinoText, 144, 23, color);
88-
}
70+
}

‎examples/Display/Graphics/Graphics.ino‎

Lines changed: 31 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ void setup(void) {
2323

2424
// large block of text
2525
carrier.display.fillScreen(ST77XX_BLACK);
26-
testdrawtext("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur adipiscing ante sed nibh tincidunt feugiat. Maecenas enim massa, fringilla sed malesuada et, malesuada sit amet turpis. Sed porttitor neque ut ante pretium vitae malesuada nunc bibendum. Nullam aliquet ultrices massa eu hendrerit. Ut sed nisi lorem. In vestibulum purus a tortor imperdiet posuere. ", ST77XX_WHITE);
26+
testdrawtext("Lorem ipsum dolor sit amet...", ST77XX_WHITE);
2727
delay(1000);
2828

2929
// tft print function!
3030
tftPrintTest();
31-
delay(4000);
31+
delay(500);
3232

3333
// a single pixel
3434
carrier.display.drawPixel(carrier.display.width() / 2, carrier.display.height() / 2, ST77XX_GREEN);
@@ -45,20 +45,11 @@ void setup(void) {
4545
testdrawrects(ST77XX_GREEN);
4646
delay(500);
4747

48-
testfillrects(ST77XX_YELLOW, ST77XX_MAGENTA);
49-
delay(500);
50-
5148
carrier.display.fillScreen(ST77XX_BLACK);
5249
testfillcircles(10, ST77XX_BLUE);
5350
testdrawcircles(10, ST77XX_WHITE);
5451
delay(500);
5552

56-
testroundrects();
57-
delay(500);
58-
59-
testtriangles();
60-
delay(500);
61-
6253
mediabuttons();
6354
delay(500);
6455

@@ -67,10 +58,8 @@ void setup(void) {
6758
}
6859

6960
void loop() {
70-
carrier.display.invertDisplay(true);
71-
delay(500);
72-
carrier.display.invertDisplay(false);
73-
delay(500);
61+
testtriangles();
62+
delay(2000);
7463
}
7564

7665
void testlines(uint16_t color) {
@@ -116,7 +105,7 @@ void testlines(uint16_t color) {
116105
}
117106

118107
void testdrawtext(char *text, uint16_t color) {
119-
carrier.display.setCursor(0, 0);
108+
carrier.display.setCursor(40, 100);
120109
carrier.display.setTextColor(color);
121110
carrier.display.setTextWrap(true);
122111
carrier.display.print(text);
@@ -139,14 +128,6 @@ void testdrawrects(uint16_t color) {
139128
}
140129
}
141130

142-
void testfillrects(uint16_t color1, uint16_t color2) {
143-
carrier.display.fillScreen(ST77XX_BLACK);
144-
for (int16_t x = carrier.display.width() - 1; x > 6; x -= 6) {
145-
carrier.display.fillRect(carrier.display.width() / 2 - x / 2, carrier.display.height() / 2 - x / 2 , x, x, color1);
146-
carrier.display.drawRect(carrier.display.width() / 2 - x / 2, carrier.display.height() / 2 - x / 2 , x, x, color2);
147-
}
148-
}
149-
150131
void testfillcircles(uint8_t radius, uint16_t color) {
151132
for (int16_t x = radius; x < carrier.display.width(); x += radius * 2) {
152133
for (int16_t y = radius; y < carrier.display.height(); y += radius * 2) {
@@ -167,74 +148,62 @@ void testtriangles() {
167148
carrier.display.fillScreen(ST77XX_BLACK);
168149
uint16_t color = 0xF800;
169150
int t;
170-
int w = carrier.display.width() / 2;
171-
int x = carrier.display.height() - 1;
151+
int w = 120;
152+
int x = 200;
172153
int y = 0;
173-
int z = carrier.display.width();
154+
int h = 40;
155+
int z = 200;
174156
for (t = 0 ; t <= 15; t++) {
175-
carrier.display.drawTriangle(w, y, y, x, z, x, color);
157+
carrier.display.drawTriangle(w, y, h, x, z, x, color);
176158
x -= 4;
177159
y += 4;
178160
z -= 4;
179-
color += 100;
180-
}
181-
}
182-
183-
void testroundrects() {
184-
carrier.display.fillScreen(ST77XX_BLACK);
185-
uint16_t color = 100;
186-
int i;
187-
int t;
188-
for (t = 0 ; t <= 4; t += 1) {
189-
int x = 0;
190-
int y = 0;
191-
int w = carrier.display.width() - 2;
192-
int h = carrier.display.height() - 2;
193-
for (i = 0 ; i <= 16; i += 1) {
194-
carrier.display.drawRoundRect(x, y, w, h, 5, color);
195-
x += 2;
196-
y += 3;
197-
w -= 4;
198-
h -= 6;
199-
color += 1100;
200-
}
161+
h += 4;
201162
color += 100;
202163
}
203164
}
204165

205166
void tftPrintTest() {
206167
carrier.display.setTextWrap(false);
207168
carrier.display.fillScreen(ST77XX_BLACK);
208-
carrier.display.setCursor(0, 30);
169+
carrier.display.setCursor(20, 80);
209170
carrier.display.setTextColor(ST77XX_RED);
210171
carrier.display.setTextSize(1);
211172
carrier.display.println("Hello World!");
173+
carrier.display.setCursor(20, 90);
212174
carrier.display.setTextColor(ST77XX_YELLOW);
213175
carrier.display.setTextSize(2);
214176
carrier.display.println("Hello World!");
177+
carrier.display.setCursor(20, 110);
215178
carrier.display.setTextColor(ST77XX_GREEN);
216179
carrier.display.setTextSize(3);
217180
carrier.display.println("Hello World!");
181+
carrier.display.setCursor(20, 140);
218182
carrier.display.setTextColor(ST77XX_BLUE);
219183
carrier.display.setTextSize(4);
220184
carrier.display.print(1234.567);
221185
delay(1500);
222-
carrier.display.setCursor(0, 0);
186+
carrier.display.setCursor(20, 80);
223187
carrier.display.fillScreen(ST77XX_BLACK);
224188
carrier.display.setTextColor(ST77XX_WHITE);
225189
carrier.display.setTextSize(0);
226190
carrier.display.println("Hello World!");
191+
carrier.display.setCursor(20, 90);
227192
carrier.display.setTextSize(1);
228193
carrier.display.setTextColor(ST77XX_GREEN);
229194
carrier.display.print(p, 6);
230195
carrier.display.println(" Want pi?");
231196
carrier.display.println(" ");
197+
carrier.display.setCursor(20, 100);
232198
carrier.display.print(8675309, HEX); // print 8,675,309 out in HEX!
233199
carrier.display.println(" Print HEX!");
234200
carrier.display.println(" ");
235201
carrier.display.setTextColor(ST77XX_WHITE);
202+
carrier.display.setCursor(20, 110);
236203
carrier.display.println("Sketch has been");
204+
carrier.display.setCursor(20, 120);
237205
carrier.display.println("running for: ");
206+
carrier.display.setCursor(20, 130);
238207
carrier.display.setTextColor(ST77XX_MAGENTA);
239208
carrier.display.print(millis() / 1000);
240209
carrier.display.setTextColor(ST77XX_WHITE);
@@ -244,20 +213,20 @@ void tftPrintTest() {
244213
void mediabuttons() {
245214
// play
246215
carrier.display.fillScreen(ST77XX_BLACK);
247-
carrier.display.fillRoundRect(25, 10, 78, 60, 8, ST77XX_WHITE);
248-
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_RED);
216+
carrier.display.fillRoundRect(75, 60, 78, 60, 8, ST77XX_WHITE);
217+
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_RED);
249218
delay(500);
250219
// pause
251-
carrier.display.fillRoundRect(25, 90, 78, 60, 8, ST77XX_WHITE);
252-
carrier.display.fillRoundRect(39, 98, 20, 45, 5, ST77XX_GREEN);
253-
carrier.display.fillRoundRect(69, 98, 20, 45, 5, ST77XX_GREEN);
220+
carrier.display.fillRoundRect(75, 140, 78, 60, 8, ST77XX_WHITE);
221+
carrier.display.fillRoundRect(89, 148, 20, 45, 5, ST77XX_GREEN);
222+
carrier.display.fillRoundRect(119, 148, 20, 45, 5, ST77XX_GREEN);
254223
delay(500);
255224
// play color
256-
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_BLUE);
225+
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_BLUE);
257226
delay(50);
258227
// pause color
259-
carrier.display.fillRoundRect(39, 98, 20, 45, 5, ST77XX_RED);
260-
carrier.display.fillRoundRect(69, 98, 20, 45, 5, ST77XX_RED);
228+
carrier.display.fillRoundRect(89, 148, 20, 45, 5, ST77XX_RED);
229+
carrier.display.fillRoundRect(119, 148, 20, 45, 5, ST77XX_RED);
261230
// play color
262-
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_GREEN);
263-
}
231+
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_GREEN);
232+
}

‎examples/LEDs-Examples/strandtest/strandtest.ino‎ renamed to ‎examples/LEDs-Examples/LED_Blink/LED_Blink.ino‎

File renamed without changes.

‎examples/TouchPads/Relays_control_Qtouch/Relays_control_Qtouch.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void loop() {
5353
carrier.leds.show();
5454

5555
}
56-
if (carrier.Buttons.onTouchDown(TOUCH3)) {
56+
if (carrier.Buttons.onTouchDown(TOUCH4)) {
5757
newRelay1 = !newRelay1;
5858
if (newRelay1) {
5959
carrier.leds.setPixelColor(4, c_orange);
@@ -63,7 +63,7 @@ void loop() {
6363
carrier.leds.show();
6464
}
6565

66-
if (carrier.Buttons.onTouchDown(TOUCH1)) {
66+
if (carrier.Buttons.onTouchDown(TOUCH2)) {
6767
carrier.leds.setPixelColor(2, c_orange);
6868
carrier.leds.show();
6969

‎src/Arduino_MKRIoTCarrier.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ int MKRIoTCarrier::begin() {
102102
Serial.println("Sd card not detected");
103103
}
104104

105+
if (_revision == BOARD_REVISION_2){
106+
pinMode(TFT_BACKLIGHT, OUTPUT);
107+
digitalWrite(TFT_BACKLIGHT, HIGH);
108+
}
109+
105110
return true;
106111
}
107112

0 commit comments

Comments
 (0)