diff --git a/binaries/Tag/SOL_M3_Uni_full_0029.bin b/binaries/Tag/SOL_M3_Uni_full_0029.bin new file mode 100644 index 00000000..fbd6a53e Binary files /dev/null and b/binaries/Tag/SOL_M3_Uni_full_0029.bin differ diff --git a/binaries/Tag/SOL_M3_Uni_ota_0029.bin b/binaries/Tag/SOL_M3_Uni_ota_0029.bin new file mode 100644 index 00000000..e9641485 Binary files /dev/null and b/binaries/Tag/SOL_M3_Uni_ota_0029.bin differ diff --git a/binaries/Tag/tagotaversions.json b/binaries/Tag/tagotaversions.json index a25e768e..97ac54e4 100644 --- a/binaries/Tag/tagotaversions.json +++ b/binaries/Tag/tagotaversions.json @@ -32,68 +32,78 @@ }, "2E": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "2F": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "30": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "31": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "32": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "33": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "34": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "35": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "36": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "40": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "41": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "42": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "43": { "type": "SOL_M3_Uni_ota", - "version": "0027", - "md5": "55541b0f440e041d559c4d72c9dee524" + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" + }, + "45": { + "type": "SOL_M3_Uni_ota", + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" + }, + "46": { + "type": "SOL_M3_Uni_ota", + "version": "0029", + "md5": "457e14f5de203aea54bdc492f5dc2e0c" }, "80": { "type": "chroma74y_ota", diff --git a/resources/tagtypes/45.json b/resources/tagtypes/45.json new file mode 100644 index 00000000..4a6bd7b4 --- /dev/null +++ b/resources/tagtypes/45.json @@ -0,0 +1,84 @@ +{ + "version": 1, + "name": "M3 2.2 Lite\"", + "width": 250, + "height": 128, + "rotatebuffer": 3, + "bpp": 2, + "colortable": { + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ], + "red": [ 255, 0, 0 ] + }, + "shortlut": 0, + "zlib_compression": "27", + "options": [ "led" ], + "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], + + "template": { + "1": { + "weekday": [ 128, 3, "Signika-SB.ttf", 50 ], + "date": [ 128, 62, "Signika-SB.ttf", 40 ] + }, + "2": { + "fonts": [ "Signika-SB.ttf", 150, 150, 150, 115, 90, 70 ], + "xy": [ 128, 53 ] + }, + "16": { + "location": [ 7, 15, "t0_14b_tf" ], + "title": [ 210, 11, "glasstown_nbp_tf" ], + "cols": [ 4, 121, 10, "glasstown_nbp_tf" ], + "bars": [ 10, 110, 8 ] + }, + "4": { + "location": [ 5, 3, "fonts/bahnschrift30" ], + "wind": [ 245, 3, "fonts/bahnschrift30" ], + "temp": [ 10, 60, "fonts/bahnschrift70" ], + "icon": [ 240, 20, 70, 2 ], + "dir": [ 210, -12, 40 ], + "umbrella": [ 175, -50, 25 ] + }, + "8": { + "location": [ 5, 12, "t0_14b_tf" ], + "column": [ 5, 51 ], + "day": [ 28, 18, "fonts/twcondensed20", 41, 108 ], + "icon": [ 28, 55, 30 ], + "wind": [ 18, 26 ], + "line": [ 20, 128 ] + }, + "9": { + "title": [ 8, 2, "bahnschrift20.vlw", 25 ], + "items": 5, + "line": [ 8, 25, "REFSAN12.vlw" ], + "desc": [ 0, 5, "", 1 ] + }, + "10": { + "title": [ 128, 2, "calibrib16.vlw" ], + "pos": [ 128, 16 ] + }, + "11": { + "mode": 0, + "days": 1, + "title": [ 10, 2, "fonts/bahnschrift20" ], + "date": [ 245, 2 ], + "items": 7, + "red": [ 0, 21, 256, 14 ], + "line": [ 10, 32, 15, "t0_14b_tf", 50 ] + }, + "21": [ + { "text": [ 10, 5, "OpenEpaperLink AP", "bahnschrift20", 1, 0, 0 ] }, + { "text": [ 10, 50, "IP address:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 110, 50, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 10, 70, "Channel:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 110, 70, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 10, 90, "Tag count:", "t0_14b_tf", 1, 0, 0 ] }, + { "text": [ 110, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } + ], + "27": { + "bars": [ 26, 216, 80, 20 ], + "time": [ "tahoma9.vlw" ], + "yaxis": [ "tahoma9.vlw", 6, 6 ], + "head": [ "bahnschrift20.vlw" ] + } + } +} diff --git a/resources/tagtypes/46.json b/resources/tagtypes/46.json new file mode 100644 index 00000000..dd74140a --- /dev/null +++ b/resources/tagtypes/46.json @@ -0,0 +1,67 @@ +{ + "version": 1, + "name": "M3 2.2\" BW", + "width": 296, + "height": 160, + "rotatebuffer": 3, + "bpp": 2, + "colortable": { + "white": [ 255, 255, 255 ], + "black": [ 0, 0, 0 ] + }, + "shortlut": 0, + "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 ] + }, + "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/calibrib80" ], + "icon": [ 275, 20, 90, 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 ] + } + } +}