update tagtypes for M3 0027 firmware

OpenEPaperLink · Mar 4, 2024 · a5d7282 · a5d7282
1 parent f233d90
commit a5d7282
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 426 deletions.
diff --git a/ESP32_AP-Flasher/data/tagtypes/2E.json b/ESP32_AP-Flasher/data/tagtypes/2E.json
@@ -1,20 +1,21 @@
 {
- "name": "M3 9.7\"",
- "width": 960,
- "height": 672,
- "rotatebuffer": 0,
- "bpp": 2,
- "colors": 3,
- "colortable": {
-  "white": [255, 255, 255],
-  "black": [0, 0, 0],
-  "red": [255, 0, 0],
-  "gray": [150, 150, 150]
- },
- "shortlut": 0,
- "options": ["button"],
- "contentids": [ 22, 23, 1, 5, 8, 9, 7, 19, 10, 11 ],
- "usetemplate": 1,
+	"name": "M3 9.7\"",
+	"width": 960,
+	"height": 672,
+	"rotatebuffer": 2,
+	"bpp": 2,
+	"colors": 3,
+	"colortable": {
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
+	},
+	"shortlut": 0,
+	"zlib_compression": "27",
+	"options": [ "button" ],
+	"contentids": [ 22, 23, 1, 5, 8, 9, 7, 19, 10, 11 ],
+	"usetemplate": 1,
 	"template": {
 		"1": {
 			"weekday": [ 480, -5, "Signika-SB.ttf", 160 ],
@@ -37,5 +38,5 @@
 			"days": 7,
 			"gridparam": [ 7, 19, 30, "calibrib16.vlw", "REFSAN12.vlw", 16 ]
 		}
-	}	
+	}
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/2F.json b/ESP32_AP-Flasher/data/tagtypes/2F.json
@@ -2,19 +2,20 @@
 	"name": "M3 4.3\"",
 	"width": 522,
 	"height": 152,
-	"rotatebuffer": 1,
+	"rotatebuffer": 3,
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["button"],
- "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 11, 17, 18, 19, 20, 27],
- "usetemplate": 1,
+	"zlib_compression": "27",
+	"options": [ "button" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 11, 17, 18, 19, 20, 27 ],
+	"usetemplate": 1,
 	"template": {
 		"1": {
 			"weekday": [ 160, 5, "Signika-SB.ttf", 60 ],

diff --git a/ESP32_AP-Flasher/data/tagtypes/30.json b/ESP32_AP-Flasher/data/tagtypes/30.json
@@ -6,13 +6,14 @@
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["button"],
- "contentids": [ 22, 23, 1, 2, 3, 4, 8, 7, 19, 10, 21 ],
- "usetemplate": 0
+	"zlib_compression": "27",
+	"options": [ "button" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 8, 7, 19, 10, 21 ],
+	"usetemplate": 0
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/31.json b/ESP32_AP-Flasher/data/tagtypes/31.json
@@ -2,22 +2,23 @@
 	"name": "M3 2.2\"",
 	"width": 296,
 	"height": 160,
-	"rotatebuffer": 1,
+	"rotatebuffer": 3,
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["button", "led"],
-	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26],
+	"zlib_compression": "27",
+	"options": [ "button", "led" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26 ],
 	"template": {
 		"1": {
-			"weekday": [148, 5, "Signika-SB.ttf", 60],
-			"date": [148, 75, "Signika-SB.ttf", 50]
+			"weekday": [ 148, 5, "Signika-SB.ttf", 60 ],
+			"date": [ 148, 75, "Signika-SB.ttf", 50 ]
 		},
 		"2": {
 			"fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ],
@@ -30,20 +31,20 @@
 			"bars": [ 5, 141, 10 ]
 		},
 		"4": {
-			"location": [5, 5, "fonts/bahnschrift30"],
-			"wind": [280, 5, "fonts/bahnschrift30"],
-			"temp": [5, 65, "fonts/bahnschrift70"],
-			"icon": [285, 20, 70, 2],
-			"dir": [245, -12, 40],
-			"umbrella": [190, -50, 25]
+			"location": [ 5, 5, "fonts/bahnschrift30" ],
+			"wind": [ 280, 5, "fonts/bahnschrift30" ],
+			"temp": [ 5, 65, "fonts/bahnschrift70" ],
+			"icon": [ 285, 20, 70, 2 ],
+			"dir": [ 245, -12, 40 ],
+			"umbrella": [ 190, -50, 25 ]
 		},
 		"8": {
-			"location": [5, 12, "t0_14b_tf"],
-			"column": [5, 59],
-			"day": [30, 18, "fonts/twcondensed20", 41, 108],
-			"icon": [30, 55, 30],
-			"wind": [18, 26],
-			"line": [20, 128]
+			"location": [ 5, 12, "t0_14b_tf" ],
+			"column": [ 5, 59 ],
+			"day": [ 30, 18, "fonts/twcondensed20", 41, 108 ],
+			"icon": [ 30, 55, 30 ],
+			"wind": [ 18, 26 ],
+			"line": [ 20, 128 ]
 		},
 		"9": {
 			"title": [ 5, 4, "bahnschrift20.vlw", 25 ],
@@ -52,8 +53,8 @@
 			"desc": [ 0, 5, "", 1 ]
 		},
 		"10": {
-			"title": [149, 5, "fonts/bahnschrift20"],
-			"pos": [149, 30]
+			"title": [ 149, 5, "fonts/bahnschrift20" ],
+			"pos": [ 149, 30 ]
 		},
 		"11": {
 			"mode": 0,

diff --git a/ESP32_AP-Flasher/data/tagtypes/32.json b/ESP32_AP-Flasher/data/tagtypes/32.json
@@ -2,66 +2,17 @@
 	"name": "M3 2.6\"",
 	"width": 360,
 	"height": 184,
-	"rotatebuffer": 1,
+	"rotatebuffer": 3,
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26],
-	"template": {
-		"1": {
-			"weekday": [148, 5, "Signika-SB.ttf", 60],
-			"date": [148, 75, "Signika-SB.ttf", 50]
-		},
-		"2": {
-			"fonts": [ "Signika-SB.ttf", 150, 150, 110, 80, 60, 50 ],
-			"xy": [ 148, 68 ]
-		},
-		"16": {
-			"location": [ 5, 5, "fonts/bahnschrift30" ],
-			"title": [ 247, 11, "glasstown_nbp_tf" ],
-			"cols": [ 1, 155, 12, "glasstown_nbp_tf" ],
-			"bars": [ 5, 141, 10 ]
-		},
-		"4": {
-			"location": [5, 5, "fonts/bahnschrift30"],
-			"wind": [280, 5, "fonts/bahnschrift30"],
-			"temp": [5, 65, "fonts/bahnschrift70"],
-			"icon": [285, 20, 70, 2],
-			"dir": [245, -12, 40],
-			"umbrella": [190, -50, 25]
-		},
-		"8": {
-			"location": [5, 12, "t0_14b_tf"],
-			"column": [5, 59],
-			"day": [30, 18, "fonts/twcondensed20", 41, 108],
-			"icon": [30, 55, 30],
-			"wind": [18, 26],
-			"line": [20, 128]
-		},
-		"9": {
-			"title": [ 5, 4, "bahnschrift20.vlw", 25 ],
-			"items": 8,
-			"line": [ 4, 25, "REFSAN12.vlw" ],
-			"desc": [ 0, 5, "", 1 ]
-		},
-		"10": {
-			"title": [149, 5, "fonts/bahnschrift20"],
-			"pos": [149, 30]
-		},
-		"11": {
-			"mode": 0,
-			"days": 1,
-			"title": [ 5, 2, "fonts/bahnschrift20" ],
-			"date": [ 290, 2 ],
-			"items": 10,
-			"red": [ 0, 21, 296, 14 ],
-			"line": [ 5, 32, 15, "t0_14b_tf", 50 ]
-		}
-	}
+	"zlib_compression": "27",
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26 ],
+ "usetemplate": 1
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/33.json b/ESP32_AP-Flasher/data/tagtypes/33.json
@@ -2,18 +2,19 @@
 	"name": "M3 2.9\"",
 	"width": 384,
 	"height": 168,
-	"rotatebuffer": 1,
+	"rotatebuffer": 3,
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["button", "led"],
-	"contentids": [22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27],
+	"zlib_compression": "27",
+	"options": [ "button", "led" ],
+	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 26, 27 ],
 	"usetemplate": 1,
 	"template": {
 		"1": {
@@ -31,12 +32,12 @@
 			"bars": [ 5, 141, 14 ]
 		},
 		"8": {
-			"location": [5, 12, "t0_14b_tf"],
-			"column": [5, 76],
-			"day": [39, 23, "bahnschrift20.vlw", 48, 140],
-			"icon": [39, 65, 45],
-			"wind": [23, 26],
-			"line": [20, 168]
+			"location": [ 5, 12, "t0_14b_tf" ],
+			"column": [ 5, 76 ],
+			"day": [ 39, 23, "bahnschrift20.vlw", 48, 140 ],
+			"icon": [ 39, 65, 45 ],
+			"wind": [ 23, 26 ],
+			"line": [ 20, 168 ]
 		},
 		"9": {
 			"title": [ 5, 4, "bahnschrift20.vlw", 25 ],
@@ -56,12 +57,12 @@
 			"items": 10,
 			"red": [ 0, 21, 384, 16 ],
 			"line": [ 5, 23, 18, "calibrib16.vlw", 55 ]
-		},		
+		},
 		"27": {
 			"bars": [ 12, 360, 110, 20 ],
 			"time": [ "calibrib16.vlw" ],
 			"yaxis": [ "BellCent10.vlw", 1, 6 ],
 			"head": [ "calibrib30.vlw" ]
-		}	
+		}
 	}
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/34.json b/ESP32_AP-Flasher/data/tagtypes/34.json
@@ -6,13 +6,14 @@
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["led"],
+	"zlib_compression": "27",
+	"options": [ "led" ],
 	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
 	"usetemplate": 2
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/35.json b/ESP32_AP-Flasher/data/tagtypes/35.json
@@ -12,6 +12,7 @@
 		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
+	"zlib_compression": "27",
 	"options": [ "led" ],
 	"contentids": [ 22, 23, 1, 4, 5, 8, 9, 7, 19, 10, 11 ],
 	"usetemplate": 1,

diff --git a/ESP32_AP-Flasher/data/tagtypes/36.json b/ESP32_AP-Flasher/data/tagtypes/36.json
@@ -6,13 +6,14 @@
 	"bpp": 2,
 	"colors": 3,
 	"colortable": {
-		"white": [255, 255, 255],
-		"black": [0, 0, 0],
-		"red": [255, 0, 0],
-		"gray": [150, 150, 150]
+		"white": [ 255, 255, 255 ],
+		"black": [ 0, 0, 0 ],
+		"red": [ 255, 0, 0 ],
+		"gray": [ 150, 150, 150 ]
 	},
 	"shortlut": 0,
-	"options": ["button", "led"],
-	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20],
-	"usetemplate": 1
+	"zlib_compression": "27",
+	"options": [ "button", "led" ],
+	"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ],
+	"usetemplate": 46
 }