Skip to content

Commit 3a8e6e5

Browse files
authored
Merge pull request #291 from adafruit/default-font-sizes
Add font size to schema (textSize / text_size in proto)
2 parents 0507621 + 7b1664e commit 3a8e6e5

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

components/display/eink-29-grayscale-ili0373/definition.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"epdConfig": {
1515
"mode": "grayscale4",
1616
"width": 296,
17-
"height": 128
17+
"height": 128,
18+
"textSize": 3
1819
}
1920
}
2021
}

components/display/eink-29-grayscale-ssd1680/definition.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"epdConfig": {
1515
"mode": "mono",
1616
"width": 296,
17-
"height": 128
17+
"height": 128,
18+
"textSize": 3
1819
}
1920
}
2021
}

components/display/eink-magtag/definition.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"epdConfig": {
1515
"mode": "unspecified",
1616
"width": 296,
17-
"height": 128
17+
"height": 128,
18+
"textSize": 3
1819
}
1920
}
2021
}

components/display/schema.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
"required": [
9393
"mode",
9494
"width",
95-
"height"
95+
"height",
96+
"textSize"
9697
],
9798
"properties": {
9899
"mode": {
@@ -113,6 +114,10 @@
113114
"description": "Height of the EPD display, in pixels",
114115
"type": "integer",
115116
"minimum": 1
117+
},
118+
"textSize": {
119+
"type": "integer",
120+
"description": "The default text size for the display (Scale of 8x5 px font) - Possibly Driver specific translation"
116121
}
117122
},
118123
"tftConfig": {
@@ -121,7 +126,8 @@
121126
"required": [
122127
"width",
123128
"height",
124-
"rotation"
129+
"rotation",
130+
"textSize"
125131
],
126132
"properties": {
127133
"width": {
@@ -135,6 +141,10 @@
135141
"rotation": {
136142
"type": "integer",
137143
"enum": [0, 1, 2, 3]
144+
},
145+
"textSize": {
146+
"type": "integer",
147+
"description": "The default text size for the display (Scale of 8x5 px font) - Possibly Driver specific translation"
138148
}
139149
}
140150
}

components/display/tft-114/definition.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"tftConfig": {
1515
"height": 240,
1616
"width": 135,
17-
"rotation": 3
17+
"rotation": 3,
18+
"textSize": 3
1819
}
1920
}
2021
}

components/display/tft-154-wide-angle/definition.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"tftConfig": {
1515
"height": 240,
1616
"width": 240,
17-
"rotation": 0
17+
"rotation": 0,
18+
"textSize": 3
1819
}
1920
}
2021
}

0 commit comments

Comments
 (0)