Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit 9d368a4

Browse files
authored
Merge pull request #22 from geeksville/master
bump to 0.19.15 for new binary release
2 parents 15c1e1e + 5172f38 commit 9d368a4

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

firmware/common/Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
# The integer build number for this release, MUST BE INCREMENTED FOR EACH RELEASE SO BOOTLOADER WILL INSTALL
7-
VERSION_NUM := 14
7+
VERSION_NUM := 15
88

99
VERSION_STRING := 0.19.$(VERSION_NUM)
1010

firmware/common/src/mainscreen.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ Field custom3 = FIELD_CUSTOMIZABLE_PTR(&l3_vars.field_selectors[3], customizable
9696
Field custom4 = FIELD_CUSTOMIZABLE_PTR(&l3_vars.field_selectors[4], customizables);
9797

9898

99-
Field bootHeading = FIELD_DRAWTEXTPTR("OpenSource EBike");
100-
Field bootURL = FIELD_DRAWTEXTPTR("github.com/\nOpenSource-EBike-Firmware");
99+
Field bootHeading = FIELD_DRAWTEXTPTR(_S("OpenSource EBike", "OS-EBike"));
100+
Field bootURL = FIELD_DRAWTEXTPTR(_S("github.com/\nOpenSource-EBike-Firmware", "see github.com"));
101101
Field bootFirmwareVersion = FIELD_DRAWTEXTPTR("850C firmware version:");
102102
Field bootVersion = FIELD_DRAWTEXTPTR(VERSION_STRING);
103103
Field bootStatus = FIELD_DRAWTEXT(.msg = "Booting...");
@@ -137,11 +137,13 @@ Screen bootScreen = {
137137
.field = &bootURL,
138138
.font = &SMALL_TEXT_FONT,
139139
},
140+
#ifndef SW102
140141
{
141142
.x = 0, .y = YbyEighths(4), .height = -1,
142143
.field = &bootFirmwareVersion,
143144
.font = &SMALL_TEXT_FONT,
144145
},
146+
#endif
145147
{
146148
.x = 0, .y = -8, .height = -1,
147149
.field = &bootVersion,

0 commit comments

Comments
 (0)