Skip to content

Commit

Permalink
Merge pull request #2 from PCB-Arts/release/v1.0.1
Browse files Browse the repository at this point in the history 
Updated source files to version 1.0.1
  • Loading branch information
@Fju
Fju authored Jun 18, 2021
2 parents c73b9f2 + 061a6df commit 7656082
Show file tree
Hide file tree
Showing 28 changed files with 472 additions and 184 deletions.
9 changes: 9 additions & 0 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ In general you have to loosely follow these steps to build and sign images for t
7. (Option 2) Sign the images by running ``sign_all_images.sh`` from the tools folder of the display bootloader.
8. (Option 2) Copy the signed (without _unsigned) `.BIN` files onto an SD card. And flash using the bootloader.

#####################
Flashing
#####################

#####################
Display
#####################

Flash the display with the STM32CubeProgrammer, as external Loader use the MT25QL128A_STM32469I-DK. Flash the Bootloader and then the Display.hex File
3 changes: 2 additions & 1 deletion core-fw/src/control/sequence.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ static void seq_fsm() {
vpo_log("Profile in preheat");
seq_state = SEQ_GENERATE_VAPOUR;
} else {
vpo_log("profile aborted - in preheat");
seq_state = SEQ_IDLE;
}
break;
Expand Down Expand Up @@ -208,7 +209,7 @@ static int safety_checks() {
rc = 0;

//check if lid is closed
if (lid_axis.encoder->position > 200)
if (!lid_control_lid_closed())
rc = 0;

return rc;
Expand Down
37 changes: 16 additions & 21 deletions display-fw/TouchGFX/VPO-display.touchgfx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@
"AutoSize": true,
"LineSpacing": 0,
"Wildcard1": {
"TextId": "SingleUseId34",
"UseBuffer": true,
"BufferSize": 4
},
Expand All @@ -351,10 +350,10 @@
"BufferSize": 2
},
"Name": "galden_tmp",
"X": 594,
"Y": 41,
"Width": 109,
"Height": 17,
"X": 593,
"Y": 53,
"Width": 107,
"Height": 19,
"Visible": true,
"LockPosition": false,
"Draggable": false,
Expand All @@ -367,8 +366,8 @@
"RelativeFilename": "drop.png",
"Alpha": 150,
"Name": "galden",
"X": 549,
"Y": 31,
"X": 553,
"Y": 43,
"Width": 36,
"Height": 36,
"Visible": true,
Expand Down Expand Up @@ -559,10 +558,10 @@
"BufferSize": 2
},
"Name": "watersystem_tmp",
"X": 173,
"Y": 41,
"Width": 178,
"Height": 17,
"X": 118,
"Y": 52,
"Width": 172,
"Height": 19,
"Visible": true,
"LockPosition": false,
"Draggable": false,
Expand All @@ -581,8 +580,8 @@
"LoopEnabled": true,
"AnimationEndedCallback": false,
"Name": "watersystem",
"X": 126,
"Y": 31,
"X": 69,
"Y": 43,
"Width": 36,
"Height": 36,
"Visible": true,
Expand Down Expand Up @@ -1576,10 +1575,6 @@
"TextEntryId": "SingleUseId19",
"IsResource": false
},
{
"TextEntryId": "SingleUseId20",
"IsResource": false
},
{
"TextEntryId": "SingleUseId21",
"IsResource": false
Expand Down Expand Up @@ -1624,10 +1619,6 @@
"TextEntryId": "SingleUseId32",
"IsResource": true
},
{
"TextEntryId": "SingleUseId34",
"IsResource": false
},
{
"TextEntryId": "SingleUseId37",
"IsResource": true
Expand Down Expand Up @@ -1779,6 +1770,10 @@
{
"TextEntryId": "SelftestRunningBody",
"IsResource": true
},
{
"TextEntryId": "SingleUseId20",
"IsResource": false
}
],
"Name": "STM32F469I-DISCO",
Expand Down
Binary file modified display-fw/TouchGFX/assets/texts/texts.xlsx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion display-fw/TouchGFX/generated/fonts/UnicodeListarial_14_4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
67
68
70
71
72
76
78
Expand All @@ -30,6 +29,7 @@
82
83
84
85
86
97
98
Expand Down
33 changes: 33 additions & 0 deletions display-fw/TouchGFX/generated/fonts/UnicodeListarial_16_4.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
32
44
45
46
48
49
50
51
52
53
54
55
56
57
58
63
67
70
71
83
97
100
101
103
105
108
109
110
111
115
116
121
176
1 change: 1 addition & 0 deletions display-fw/TouchGFX/generated/fonts/UnicodeListarial_20_4.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
10
32
45
46
Expand Down
2 changes: 1 addition & 1 deletion display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProvider.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4]],"generate_font_format":"0"}
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4],["text_graph_size","arial.ttf",16,4]],"generate_font_format":"0"}
2 changes: 1 addition & 1 deletion display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProviderHpp.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4]],"generate_font_format":"0"}
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4],["text_graph_size","arial.ttf",16,4]],"generate_font_format":"0"}
2 changes: 1 addition & 1 deletion display-fw/TouchGFX/generated/fonts/cache/Font_arial_14_4bppCpp.cache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ F0
67
68
70
71
72
76
78
Expand All @@ -31,6 +30,7 @@ F0
82
83
84
85
86
97
98
Expand Down
35 changes: 35 additions & 0 deletions display-fw/TouchGFX/generated/fonts/cache/Font_arial_16_4bppCpp.cache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
BA
F0
32
44
45
46
48
49
50
51
52
53
54
55
56
57
58
63
67
70
71
83
97
100
101
103
105
108
109
110
111
115
116
121
176
14 changes: 8 additions & 6 deletions display-fw/TouchGFX/generated/fonts/include/fonts/ApplicationFontProvider.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,18 @@ struct Typography
static const touchgfx::FontId SMALL = 2;
static const touchgfx::FontId MEDIUM = 3;
static const touchgfx::FontId VPO_DEFAULT = 4;
static const touchgfx::FontId TEXT_GRAPH_SIZE = 5;
};

struct TypographyFontIndex
{
static const touchgfx::FontId DEFAULT = 0; // arial_20_4bpp
static const touchgfx::FontId LARGE = 1; // arial_40_4bpp
static const touchgfx::FontId SMALL = 2; // arial_10_4bpp
static const touchgfx::FontId MEDIUM = 3; // arial_14_4bpp
static const touchgfx::FontId VPO_DEFAULT = 4; // arial_26_4bpp
static const uint16_t NUMBER_OF_FONTS = 5;
static const touchgfx::FontId DEFAULT = 0; // arial_20_4bpp
static const touchgfx::FontId LARGE = 1; // arial_40_4bpp
static const touchgfx::FontId SMALL = 2; // arial_10_4bpp
static const touchgfx::FontId MEDIUM = 3; // arial_14_4bpp
static const touchgfx::FontId VPO_DEFAULT = 4; // arial_26_4bpp
static const touchgfx::FontId TEXT_GRAPH_SIZE = 5; // arial_16_4bpp
static const uint16_t NUMBER_OF_FONTS = 6;
};

class ApplicationFontProvider : public touchgfx::FontProvider
Expand Down
3 changes: 3 additions & 0 deletions display-fw/TouchGFX/generated/fonts/src/ApplicationFontProvider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ touchgfx::Font* ApplicationFontProvider::getFont(touchgfx::FontId typography)
case Typography::VPO_DEFAULT:
// arial_26_4bpp
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[4]);
case Typography::TEXT_GRAPH_SIZE:
// arial_16_4bpp
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[5]);
default:
return 0;
}
Expand Down
9 changes: 4 additions & 5 deletions display-fw/TouchGFX/generated/fonts/src/Font_arial_14_4bpp_0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ KEEP extern const uint8_t unicodes_arial_14_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
0xFD, 0xFF, 0xFF, 0x0E, 0x9D, 0x44, 0x44, 0x04, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00,
0x7D, 0x11, 0x11, 0x00, 0xFD, 0xFF, 0xFF, 0x03, 0x9D, 0x44, 0x44, 0x01, 0x7D, 0x00, 0x00, 0x00,
0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00,
// Unicode: [0x0047]
0x00, 0x71, 0xED, 0xBE, 0x03, 0x10, 0xEC, 0x46, 0xA5, 0x3F, 0x80, 0x2E, 0x00, 0x00, 0xAA, 0xE0,
0x07, 0x00, 0x00, 0x11, 0xF2, 0x03, 0x00, 0x00, 0x00, 0xF3, 0x02, 0x40, 0xFF, 0xFF, 0xF2, 0x03,
0x10, 0x33, 0xF7, 0xE0, 0x07, 0x00, 0x00, 0xF4, 0x80, 0x2E, 0x00, 0x00, 0xF7, 0x10, 0xEC, 0x58,
0xB6, 0xAF, 0x00, 0x70, 0xEC, 0xBE, 0x05,
// Unicode: [0x0048]
0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5,
0x7D, 0x00, 0x00, 0xF5, 0xFD, 0xFF, 0xFF, 0xFF, 0x9D, 0x33, 0x33, 0xF7, 0x7D, 0x00, 0x00, 0xF5,
Expand Down Expand Up @@ -123,6 +118,10 @@ KEEP extern const uint8_t unicodes_arial_14_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60,
0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E,
0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00,
// Unicode: [0x0055]
0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5,
0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x8C, 0x00, 0x00, 0xE6,
0xCA, 0x00, 0x00, 0xBB, 0xF3, 0x5B, 0xA6, 0x4F, 0x40, 0xEB, 0xCE, 0x04,
// Unicode: [0x0056]
0xAB, 0x00, 0x00, 0x40, 0x1F, 0xE6, 0x00, 0x00, 0xA0, 0x0A, 0xF1, 0x05, 0x00, 0xE0, 0x05, 0xB0,
0x0A, 0x00, 0xE5, 0x01, 0x50, 0x0E, 0x00, 0x9A, 0x00, 0x10, 0x4E, 0x00, 0x4E, 0x00, 0x00, 0x9A,
Expand Down
Loading

0 comments on commit 7656082

Please sign in to comment.