Skip to content

Commit

Permalink
Add BrainPad logo from Greg
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmoskal
mmoskal committed Apr 1, 2019
1 parent bfa3020 commit 8c4da1c
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 73 deletions.
187 changes: 122 additions & 65 deletions boards/brainpad_arcade/board.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,77 +8,134 @@
#define BOARD_FLASH_SIZE (512 * 1024)
#define BOARD_ID "STM32F401-BrainPad-Arcade-RevA"


#ifdef DEFINE_CONFIGDATA
__attribute__((section(".config"))) __attribute__((used)) //
const uint32_t configData[] = {
/* CF2 START */
513675505, 539130489, // magic
58, 100, // used entries, total entries
1, 0x2e, // PIN_ACCELEROMETER_INT = PC14
2, 0x16, // PIN_ACCELEROMETER_SCL = PIN_SCL
3, 0x17, // PIN_ACCELEROMETER_SDA = PIN_SDA
4, 0x11, // PIN_BTN_A = PB01
5, 0x10, // PIN_BTN_B = PB00
13, 0x29, // PIN_LED = PC09
18, 0x14, // PIN_MISO = PB04
19, 0x15, // PIN_MOSI = PB05
21, 0x3, // PIN_RX = PA03
23, 0x13, // PIN_SCK = PB03
24, 0x16, // PIN_SCL = PB06
25, 0x17, // PIN_SDA = PB07
28, 0x2, // PIN_TX = PA02
32, 0x1d, // PIN_DISPLAY_SCK = PB13
33, 0x1e, // PIN_DISPLAY_MISO = PB14
34, 0x1f, // PIN_DISPLAY_MOSI = PB15
35, 0x1c, // PIN_DISPLAY_CS = PB12
36, 0x25, // PIN_DISPLAY_DC = PC05
37, 0xa0, // DISPLAY_WIDTH = 160
38, 0x80, // DISPLAY_HEIGHT = 128
39, 0x80, // DISPLAY_CFG0 = 0x80
40, 0x603, // DISPLAY_CFG1 = 0x603
41, 0x16, // DISPLAY_CFG2 = 0x16
43, 0x24, // PIN_DISPLAY_RST = PC04
44, 0x27, // PIN_DISPLAY_BL = PC07
45, 0x1, // PIN_SERVO_1 = PA01
46, 0x0, // PIN_SERVO_2 = PA00
47, 0xf, // PIN_BTN_LEFT = PA15
48, 0x2d, // PIN_BTN_RIGHT = PC13
49, 0x5, // PIN_BTN_UP = PA05
50, 0x1a, // PIN_BTN_DOWN = PB10
51, 0x2a, // PIN_BTN_MENU = PC10
55, 0x28, // PIN_LED1 = PC08
59, 0x100, // SPEAKER_VOLUME = 256
60, 0x9, // PIN_JACK_TX = PA09
61, 0x6, // PIN_JACK_SENSE = PA06
62, 0x4, // PIN_JACK_HPEN = PA04
63, 0xa, // PIN_JACK_BZEN = PA10
64, 0x7, // PIN_JACK_PWREN = PA07
65, 0x8, // PIN_JACK_SND = PA08
66, 0x28, // PIN_JACK_BUSLED = PC08
67, 0x29, // PIN_JACK_COMMLED = PC09
70, 0x38, // ACCELEROMETER_TYPE = MMA8453
74, 0x12, // PIN_BTN_MENU2 = PB02
151, 0x2, // PIN_D1 = PA02
152, 0x3, // PIN_D2 = PA03
153, 0x13, // PIN_D3 = PB03
154, 0x14, // PIN_D4 = PB04
155, 0x15, // PIN_D5 = PB05
156, 0x16, // PIN_D6 = PB06
157, 0x17, // PIN_D7 = PB07
204, 0x80000, // FLASH_BYTES = 0x80000
205, 0x18000, // RAM_BYTES = 0x18000
208, 0x16e42d61, // BOOTLOADER_BOARD_ID = 0x16e42d61
209, 0x57755a57, // UF2_FAMILY = STM32F401
210, 0x10, // PINS_PORT_SIZE = PA_16
211, 0x1, // BOOTLOADER_PROTECTION = 1
212, 0x78, // POWER_DEEPSLEEP_TIMEOUT = 120
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
513675505, 539130489, // magic
58, 100, // used entries, total entries
1, 0x2e, // PIN_ACCELEROMETER_INT = PC14
2, 0x16, // PIN_ACCELEROMETER_SCL = PIN_SCL
3, 0x17, // PIN_ACCELEROMETER_SDA = PIN_SDA
4, 0x11, // PIN_BTN_A = PB01
5, 0x10, // PIN_BTN_B = PB00
13, 0x29, // PIN_LED = PC09
18, 0x14, // PIN_MISO = PB04
19, 0x15, // PIN_MOSI = PB05
21, 0x3, // PIN_RX = PA03
23, 0x13, // PIN_SCK = PB03
24, 0x16, // PIN_SCL = PB06
25, 0x17, // PIN_SDA = PB07
28, 0x2, // PIN_TX = PA02
32, 0x1d, // PIN_DISPLAY_SCK = PB13
33, 0x1e, // PIN_DISPLAY_MISO = PB14
34, 0x1f, // PIN_DISPLAY_MOSI = PB15
35, 0x1c, // PIN_DISPLAY_CS = PB12
36, 0x25, // PIN_DISPLAY_DC = PC05
37, 0xa0, // DISPLAY_WIDTH = 160
38, 0x80, // DISPLAY_HEIGHT = 128
39, 0x80, // DISPLAY_CFG0 = 0x80
40, 0x603, // DISPLAY_CFG1 = 0x603
41, 0x16, // DISPLAY_CFG2 = 0x16
43, 0x24, // PIN_DISPLAY_RST = PC04
44, 0x27, // PIN_DISPLAY_BL = PC07
45, 0x1, // PIN_SERVO_1 = PA01
46, 0x0, // PIN_SERVO_2 = PA00
47, 0xf, // PIN_BTN_LEFT = PA15
48, 0x2d, // PIN_BTN_RIGHT = PC13
49, 0x5, // PIN_BTN_UP = PA05
50, 0x1a, // PIN_BTN_DOWN = PB10
51, 0x2a, // PIN_BTN_MENU = PC10
55, 0x28, // PIN_LED1 = PC08
59, 0x100, // SPEAKER_VOLUME = 256
60, 0x9, // PIN_JACK_TX = PA09
61, 0x6, // PIN_JACK_SENSE = PA06
62, 0x4, // PIN_JACK_HPEN = PA04
63, 0xa, // PIN_JACK_BZEN = PA10
64, 0x7, // PIN_JACK_PWREN = PA07
65, 0x8, // PIN_JACK_SND = PA08
66, 0x28, // PIN_JACK_BUSLED = PC08
67, 0x29, // PIN_JACK_COMMLED = PC09
70, 0x38, // ACCELEROMETER_TYPE = MMA8453
74, 0x12, // PIN_BTN_MENU2 = PB02
151, 0x2, // PIN_D1 = PA02
152, 0x3, // PIN_D2 = PA03
153, 0x13, // PIN_D3 = PB03
154, 0x14, // PIN_D4 = PB04
155, 0x15, // PIN_D5 = PB05
156, 0x16, // PIN_D6 = PB06
157, 0x17, // PIN_D7 = PB07
204, 0x80000, // FLASH_BYTES = 0x80000
205, 0x18000, // RAM_BYTES = 0x18000
208, 0x16e42d61, // BOOTLOADER_BOARD_ID = 0x16e42d61
209, 0x57755a57, // UF2_FAMILY = STM32F401
210, 0x10, // PINS_PORT_SIZE = PA_16
211, 0x1, // BOOTLOADER_PROTECTION = 1
212, 0x78, // POWER_DEEPSLEEP_TIMEOUT = 120
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* CF2 END */
};
#endif

#endif /* BOARD_H */
#ifdef DEFINE_CUSTOM_LOGO
const uint8_t brain_A0[] = {32, 32, 60, 191, 182, 31, 152, 200, 151, 202, 149, 204, 143,
209, 142, 210, 141, 211, 141, 211, 139, 214, 137, 215, 136, 216,
136, 216, 135, 217, 64, 217, 64, 217, 96, 217, 96, 218, 120,
217, 124, 217, 124, 217, 124, 217, 124, 217, 124, 216, 120, 217,
124, 217, 124, 217, 124, 217, 124, 217, 120, 217, 0};

const uint8_t brain_A1[] = {
32, 32, 108, 191, 191, 153, 7, 151, 63, 152, 200, 151, 202, 148, 204, 144, 206, 145, 1,
120, 3, 139, 1, 135, 7, 139, 49, 135, 15, 136, 13, 99, 120, 139, 15, 96, 120, 139,
31, 138, 15, 64, 63, 138, 31, 135, 201, 4, 62, 136, 63, 199, 112, 1, 112, 19, 124,
94, 1, 60, 31, 79, 31, 88, 201, 136, 63, 56, 118, 15, 96, 7, 31, 126, 1, 120,
96, 107, 63, 126, 15, 28, 123, 115, 95, 64, 59, 62, 76, 13, 16, 79, 71, 65, 97,
108, 3, 120, 25, 76, 121, 205, 6, 123, 126, 206, 135, 95, 63, 66, 7};

const uint8_t brain_B0[] = {32, 32, 60, 126, 216, 124, 218, 126, 217, 126, 217, 126, 216,
124, 217, 124, 217, 120, 218, 124, 217, 124, 217, 124, 217, 124,
217, 124, 217, 124, 216, 112, 217, 112, 217, 96, 217, 136, 216,
137, 215, 137, 215, 137, 214, 138, 213, 140, 212, 142, 210, 147,
205, 149, 203, 150, 201, 152, 199, 154, 31, 191, 165};

const uint8_t brain_B1[] = {
32, 32, 111, 112, 31, 79, 96, 64, 126, 121, 104, 108, 104, 79, 79, 77, 15, 125, 125,
89, 125, 17, 79, 31, 64, 15, 118, 125, 7, 112, 64, 76, 55, 136, 3, 137, 31, 3,
62, 96, 112, 206, 14, 30, 30, 115, 119, 97, 111, 33, 135, 31, 124, 25, 4, 112, 67,
63, 103, 135, 31, 112, 109, 202, 62, 96, 89, 203, 62, 64, 125, 203, 62, 137, 202, 135,
31, 137, 63, 3, 124, 139, 63, 7, 120, 140, 79, 113, 27, 138, 81, 99, 31, 139, 31,
3, 28, 141, 111, 1, 7, 145, 203, 151, 201, 152, 199, 153, 63, 155, 7, 191, 191, 0};

const uint8_t pad0[] = {32, 31, 63, 140, 206, 145, 206, 145, 206, 145, 206, 145, 206, 145,
201, 150, 201, 151, 200, 152, 63, 153, 95, 7, 147, 201, 149, 202,
149, 202, 149, 202, 149, 202, 149, 202, 149, 202, 149, 202, 150, 201,
151, 200, 151, 200, 150, 201, 150, 201, 150, 201, 150, 201, 145, 206,
145, 206, 145, 206, 145, 206, 145, 206, 191, 0};

const uint8_t pad1[] = {32, 31, 59, 172, 204, 147, 204, 147, 99, 31, 145, 99, 152,
99, 152, 199, 153, 31, 153, 15, 190, 3, 148, 123, 151, 119,
1, 145, 19, 1, 145, 17, 1, 145, 19, 1, 145, 200, 152,
63, 153, 63, 184, 15, 151, 63, 151, 199, 152, 99, 152, 99,
152, 99, 147, 203, 148, 204, 147, 204, 191, 164};

const uint8_t tm[] = {16, 16, 21, 179, 1, 137, 1, 137, 15, 137, 1, 137,
1, 153, 15, 138, 1, 138, 1, 136, 1, 136, 15, 166};

static void customLogo() {
printicon(2, 10, 15, brain_A0);
printicon(2, 10, 3, brain_A1);
printicon(34, 10, 15, brain_B0);
printicon(34, 10, 3, brain_B1);
printicon(65, 9, 15, pad0);
printicon(65, 9, 1, pad1);
printicon(93, 18, 15, tm);
}

#define CUSTOM_LOGO customLogo()

#endif

#endif /* BOARD_H */
6 changes: 0 additions & 6 deletions images.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ const uint8_t arrowLogo[] = {
32, 32, 54, 137, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 151, 201, 146, 211, 142, 209, 144, 207, 146, 205, 148, 203, 150, 201, 152, 199, 154, 31, 154, 7, 154, 1, 191, 191, 191, 175
};

// https://makecode.com/_HTiagjK9wE1W
const uint8_t ghiLogo[] = {
32, 32, 98, 142, 3, 152, 9, 152, 33, 153, 33, 153, 63, 1, 145, 199, 14, 144, 202, 30, 142, 204, 30, 140, 205, 62, 140, 31, 120, 30, 138, 95, 111, 125, 139, 95, 109, 125, 138, 63, 91, 123, 3, 112, 63, 124, 62, 136, 209, 62, 135, 199, 135, 111, 15, 96, 199,
126, 125, 137, 201, 126, 126, 137, 63, 64, 123, 3, 96, 205, 62, 138, 31, 96, 125, 140, 205, 62, 140, 205, 62, 141, 203, 60, 143, 202, 30, 145, 199, 14, 146, 113, 2, 146, 97, 154, 17, 154, 7, 191, 141
};

const uint8_t font8[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x5e, 0x00, 0x00, 0x00,
Expand Down
20 changes: 19 additions & 1 deletion screen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@

#include <string.h>

void printicon(int x, int y, int col, const uint8_t *icon);
#define DEFINE_CUSTOM_LOGO 1

#include "pins.h"
#include "bl.h"

#ifndef CUSTOM_LOGO
#define CUSTOM_LOGO /* nothing */
#endif


#define DISPLAY_WIDTH 160
#define DISPLAY_HEIGHT 128

Expand Down Expand Up @@ -348,15 +356,25 @@ void draw_hold_menu() {
draw_screen();
}

void print4border(int x, int y, int c, const char *str) {
print4(x - 1, y - 1, 15, str);
print4(x + 1, y - 1, 15, str);
print4(x - 1, y + 1, 15, str);
print4(x + 1, y + 1, 15, str);
print4(x, y, c, str);
}

void draw_drag() {
drawBar(0, 52, 10);
drawBar(52, 55, 8);
drawBar(107, 14, 4);

print4(108, 5, 1, "F4");
print4border(109, 5, 1, "F4");
print(112, 40, 8, "v" UF2_VERSION);
print(23, 110, 1, "arcade.makecode.com");

CUSTOM_LOGO;

#define DRAG 70
#define DRAGX 10
printicon(DRAGX + 20, DRAG + 5, 1, fileLogo);
Expand Down
2 changes: 1 addition & 1 deletion uf2cfg.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define UF2_VERSION "2.6.0"
#define UF2_VERSION "2.6.1"
#ifndef BOARD_ID
#define BOARD_ID "STM32F4xx-Arcade-Generic"
#endif
Expand Down

0 comments on commit 8c4da1c

Please sign in to comment.