From 6d42f0e65ed0d2d3dba9bca245e2891aa3f8f76b Mon Sep 17 00:00:00 2001 From: James Babcock Date: Fri, 31 Jul 2026 11:41:55 -0700 Subject: [PATCH] Expand screen resolution to the full 640x480 --- .../faceclaw/app/FaceclawBleCommunicator.java | 10 ++--- .../faceclaw/app/g2protocol/BleProtocol.java | 2 +- app/g2/firmware-compat.ts | 6 +-- app/g2/firmware/cfw-patches.ts | 40 +++++++++---------- app/graphics/image.ts | 4 +- app/prompts.ts | 2 +- app/ui/menu.ts | 10 +++-- 7 files changed, 38 insertions(+), 36 deletions(-) diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java index 0ff57e5d..1ec70a9b 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java @@ -28,10 +28,10 @@ import java.util.Map; public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { private static final String TAG = "FaceclawComm"; - // The EvenHub image container is a transport/reconstruction carrier only. - // Its 576x288 allocation remains large enough for the compressed 580x300 - // logical image and the firmware's packed-4bpp shadow; the CFW presents that - // shadow directly instead of asking EvenHub/LVGL to composite this geometry. + // The EvenHub image container is a memory carrier only. Its 576x288 geometry + // gives the firmware separate 165888-byte display and reconstruction + // allocations: CFW reuses the former for its 640x480 packed-4bpp shadow and + // leaves the latter wholly available for compressed incoming messages. private static final BleProtocol.ImageTileOptions DASHBOARD_TILE = new BleProtocol.ImageTileOptions("img00", 10, 0, 0, 576, 288); @@ -1807,7 +1807,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { private void enqueueWarmupLocked() { BleProtocol.ImageTileOptions tile = DASHBOARD_TILE; // Warm up the legacy container with a carrier-sized blank BMP. Real - // 580x300 frames use mode 6 and are intentionally independent of this + // 640x480 frames use mode 6 and are intentionally independent of this // geometry; a mismatched raw BMP would be rejected by the stock loader. byte[] bmp = BmpUtil.build4bppBmpFromPacked( new byte[((tile.width + 1) >> 1) * tile.height], tile.width, tile.height); diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/g2protocol/BleProtocol.java b/App_Resources/Android/src/main/java/com/faceclaw/app/g2protocol/BleProtocol.java index d051654f..88f7163d 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/g2protocol/BleProtocol.java +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/g2protocol/BleProtocol.java @@ -401,7 +401,7 @@ public class BleProtocol { * Firmware versions and the CFW capability advertisement from a settings * READ ack. Versions are fields 5/6 of the deviceReceiveRequestFromApp * submessage (field 4); the custom firmware additionally appends top-level - * field 100, a string like "EVENCFW/5 img576 img580 ... directfb fbguard", which + * field 100, a string like "EVENCFW/6 img576 img640 ... directfb fbguard", which * stock firmware never sends. Returns null when the ack carries none of it. */ public static FirmwareInfo parseSettingsFirmwareInfo(byte[] pb) { diff --git a/app/g2/firmware-compat.ts b/app/g2/firmware-compat.ts index 9e4c8792..5f41f696 100644 --- a/app/g2/firmware-compat.ts +++ b/app/g2/firmware-compat.ts @@ -1,13 +1,13 @@ /** * Compatibility check for the glasses firmware. Faceclaw requires the custom - * firmware: version >= 2.2.4.34 with the "img580" and "fbguard" extension tokens + * firmware: version >= 2.2.4.34 with the "img640" and "fbguard" extension tokens * in the CFW capability string. Stock firmware sends no capability string at all. */ import { type FirmwareInfo } from "../native/faceclaw-communicator"; const MIN_FIRMWARE_VERSION = [2, 2, 4, 34]; -const REQUIRED_FIRMWARE_EXTENSIONS = ["img580", "fbguard"] as const; +const REQUIRED_FIRMWARE_EXTENSIONS = ["img640", "fbguard"] as const; // The stock firmware release Faceclaw's custom image is built from. Stock at or // below this can be flashed with our patched image; a newer stock version is @@ -64,7 +64,7 @@ export function firmwareIncompatibilityMessage(info: FirmwareInfo): string | nul `${missingExtensions.map((extension) => `"${extension}"`).join(" and ")} extension` + `${missingExtensions.length === 1 ? "" : "s"}` + `${info.capabilities.trim() ? ` (reported: ${info.capabilities.trim()})` : ", which suggests stock firmware"}. ` + - `Faceclaw requires the modified firmware with the guarded 580x300 direct-framebuffer path.` + `Faceclaw requires the modified firmware with the guarded 640x480 direct-framebuffer path.` ); } diff --git a/app/g2/firmware/cfw-patches.ts b/app/g2/firmware/cfw-patches.ts index beed9ddc..88e326fb 100644 --- a/app/g2/firmware/cfw-patches.ts +++ b/app/g2/firmware/cfw-patches.ts @@ -19,7 +19,7 @@ export type FirmwarePatchSet = { export const CFW_PATCH_SET: FirmwarePatchSet = { "base": "g2_2.2.6.10.bin", "baseSha256": "f4dfb0b49ad3de3c2daf17f8a27a157c3dc98411d6a0d3ab2cfd0918f41b9afa", - "outputSha256": "48d66bbcfeb708f309d435908694d3fa920948ef9185bb6f2af7094415c15e86", + "outputSha256": "e8520b2473d6738de5a2bbf73cf4a42523ddd0153dd08f7ad99137fe94bb9d9d", "patches": [ { "offset": 1449549, @@ -42,115 +42,115 @@ export const CFW_PATCH_SET: FirmwarePatchSet = { { "offset": 1447919, "old": "7ef7fefd", - "new": "baf2dcf8", + "new": "baf29ef8", "desc": "bl snapshot_side @ 0x4db968" }, { "offset": 1448931, "old": "7ef704fc", - "new": "b9f2e2fe", + "new": "b9f2a4fe", "desc": "bl snapshot_side @ 0x4dbd5c" }, { "offset": 1165461, "old": "45f0cefd", - "new": "fff28df8", + "new": "fff24ff8", "desc": "bl image_deferred (deferred consumer -> FIFO restore + worker, both lenses)" }, { "offset": 1186287, "old": "d9f7d4ff", - "new": "faf2a0fc", + "new": "faf262fc", "desc": "bl settings_send_wrapper (append caps field 100)" }, { "offset": 1183983, "old": "f4f75aff", - "new": "faf2fefe", + "new": "faf2c0fe", "desc": "bl settings_decode_wrapper (Faceclaw lease field 101)" }, { "offset": 926945, "old": "08f068fa", - "new": "39f321fc", + "new": "39f3e3fb", "desc": "bl faceclaw_display_start @ 0x45c65a (fail-open double-tap takeover)" }, { "offset": 927137, "old": "08f008fa", - "new": "39f3c1fb", + "new": "39f383fb", "desc": "bl faceclaw_display_start @ 0x45c71a (fail-open double-tap takeover)" }, { "offset": 822553, "old": "28f003f8", - "new": "53f373fb", + "new": "53f335fb", "desc": "bl evenhub_longpress (replaces force-quit dialog)" }, { "offset": 823369, "old": "1cf09bfb", - "new": "53f3f7f9", + "new": "53f3b9f9", "desc": "bl ring_release (forward ring release-long-press)" }, { "offset": 1474137, "old": "7fb50600", - "new": "b4f259ba", + "new": "b4f21bba", "desc": "even_ai_display_ctrl entry -> conditional Faceclaw lease trampoline" }, { "offset": 1022741, "old": "f8f7c1fe", "new": "20f3abfb", - "desc": "bl display_copy_hook @ 0x473c8e (580x300 direct framebuffer)" + "desc": "bl display_copy_hook @ 0x473c8e (640x480 direct framebuffer)" }, { "offset": 1022959, "old": "f8f754fe", "new": "20f33efb", - "desc": "bl display_copy_hook @ 0x473d68 (580x300 direct framebuffer)" + "desc": "bl display_copy_hook @ 0x473d68 (640x480 direct framebuffer)" }, { "offset": 4301227, "old": "", - "new": "02fb01f044f6d341c0f24701084700bf084644f61751c0f24701084770b500284ed001684ef66062ccf2ff02914218bf70bd90f8081190f8095142f6c52c8d42c0f2500c2ad205eb8501014491f80d2191f80e4191f80ae191f80b3191f80c1142ea0424012c4ff0010298bf14466e1c054680f80961b9b164294eea032028bf6421012888bf024644f62060824228bf02460cf5e2731046984706e0002180f80811bde870406047e047d5f8040138b149f29942c0f244022146bde87040104770bd00bf2de9f04f99b043f6fc76c2f20006d6f8009048466ff39600b0f1005f40f08c81d9f800004ef66068ccf2ff08404540f0838199f81c02002800f06d81d9f81852002d00f0688140f2b870c2f20000d0f800a004a801f0b8f8baf1000f00f0b18140f2030ccff6807caaf180034ff41640002200bfc3f88020c3f88420c3f88820c3f88c20c3f89020c3f89420c3f89820c3f89c20c3f8a020c3f8a420c3f8a820c3f8ac20c3f8b020c3f8b420c3f8b820c3f8bc20c3f8c020c3f8c420c3f8c820c3f8cc20c3f8d020c3f8d420c3f8d820c3f8dc20c3f8e020c3f8e420c3f8e820c3f8ec20c3f8f020c3f8f420c3f8f820c3f8fc20c3f80021c3f80421c3f80821c3f80c21c3f81021c3f81421c3f81821c3f81c21c3f82021c3f82421c3f82821c3f82c21c3f83021c3f83421c3f83821c3f83c21c3f84021c3f84421c3f84821c3f84c21c3f85021c3f85421c3f85821c3f85c21c3f86021c3f86421c3f86821c3f86c21c3f87021c3f87421c3f87821c3f87c2103f5807340387ff47baf47f29d005044002200bf002300bfef5cc418e91804f80e7c4f7804f80d7c8f7804f80c7ccf7804f80b7c0f7904f80a7c4f7904f8097c8f7904f8087ccf7904f8077c0f7a04f8067c4f7a04f8057c8f7a04f8047ccf7a04f8037c0f7b04f8027c4f7b04f8017c8f7bc754cf7b1d3367700f7cb3f5917fa7704f7ce7708f7c2771cf7c67710f7da7714f7de7718f7d2772cf7d67720f7ea7724f7ee7728f7e2773cf7e6773097fa173b1d1013205f59175b2f5967f00f5a070a7d1d6f800e00eea0c00b0f1005f40f08080def8000040457bd19ef8ce00002840f0c6809ef8dc00002100288df8141000f0268105aa505c002800f0f98053185878002800f0cf809878002800f0cd80d878002800f0cb801879002800f0c9805879002800f0c7809879002800f0c580d879002800f0c380187a002800f0c180587a002800f0bf80987a002800f0bd80d87a002800f0bb80187b002800f0b980587b002800f0b780987b002800f0b580d87b002800f0b380187c002800f0b180587c002800f0af80987c002800f0ad80d87c002800f0ab8014315029abd1cbe099f81e0268b1d9f8200238b144f63421c2f207010968401a002871dc002089f81e024cf61520c0f2460019b0bde8f04f004744f6d341c0f247014ff409708847002843d00021002200bf831881540432b2f5097f59709970d970f6d1012180f8ce104ff0ff31c0f80080a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1010e0002089f81c02c9f8180289f81e02012089f81d024cf61520c0f24600804714e000203060002089f81c02c9f818024ff4163045f20f11069005a8c0f24701cdf814a08847012089f81e0204a800f089ffc9f8d40019b0bde8f08f013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f2921d84ff0520050541dd00a4445204e29507018d04f204d29907014d052204c29d07010d044204b2910710cd045204a29507108d052204929907104d020204829d07140f0898600208df8630001219ef8dd00002870d0002205ab985c00284fd09f18787838b3b87838b3f87838b3387938b3787938b3b87938b3f87938b3387a38b3787a38b3b87a38b3f87a38b3387b38b3787b38b3b87b38b3f87b38b3387c38b3787c38b3b87c38b3f87c38b31432502ad2d13ce0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a15d84ff05300985411d013444b204e2a58700cd049204d2a987008d050204c2ad87004d020204b2a187140f0608100208df8630001319ef8de0000286cd0002105aa505c00284fd05318587838b3987838b3d87838b3187938b3587938b3987938b3d87938b3187a38b3587a38b3987a38b3d87a38b3187b38b3587b38b3987b38b3d87b38b3187c38b3587c38b3987c38b3d87c38b314315029d2d138e0013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f2911d84ff0440050540dd00a4455204e29507008d050204d29907004d020204c29d07040f0ec8000208df8630001219ef8df0000284dd0002105aa505c002800f0bc8053185878002800f092809878002800f09080d878002800f08e801879002800f08c805879002800f08a809879002800f08880d879002800f08680187a002800f08480587a002800f08280987a002800f08080d87a00287ed0187b00287dd0587b00287cd0987b00287bd0d87b00287ad0187c002879d0587c002878d0987c002877d0d87c002876d014315029b4d1d0e0002940f0d180002105aa505c002800f0b88053185878002800f08e809878002800f08c80d878002800f08a801879002800f088805879002800f086809879002800f08480d879002800f08280187a002800f08080587a00287ed0987a00287dd0d87a00287cd0187b00287bd0587b00287ad0987b002879d0d87b002878d0187c002877d0587c002876d0987c002875d0d87c002874d014315029b6d181e0013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f295ad84ff05300505456d00a444e204e29507051d041204d2990704dd050204c29d07049d04f204b29107145d046204a29507141d02020492990713dd00020d0713de00020107113e7002058719fe6013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f290dd84ff04f00505409d00a444b204e29507004d020204d29907040f0788400208df8630000220df1140b1bf80200002850d00beb0203587838b3987838b3d87838b3187938b3587938b3987938b3d87938b3187a38b3587a38b3987a38b3d87a38b3187b38b3587b38b3987b38b3d87b38b3187c38b3587c38b3987c38b3d87c38b31432502ad0d12be0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a04d84ff077000bf8020003d100208df8630003e00beb020000214170def8d07000261bf80600002851d00beb0602507840b3907840b3d07840b3107940b3507940b3907940b3d07940b3107a40b3507a40b3907a40b3d07a40b3107b40b3507b40b3907b40b3d07b40b3107c40b3507c40b3907c40b3d07c40b31436502ed0d1502624e0013622e0023620e003361ee004361ce005361ae0063618e0073616e0083614e0093612e00a3610e00b360ee00c360ce00d360ae00e3608e00f3606e0103604e0113602e0123600e0133601240a2f1ed364224ff47a7342f2107504eb84004000b7fbf0f10a2911d304fb02f0b7fbf0f10a290bd304fb03f0b7fbf0f10a2905d36c43b7fbf4f00928e7d800e004463046cde902ea4f2e98bf4f20c0f1000a01901aeb060e53d0b7fbf4f00a2c00f130010bf806104cf6cd41ccf6cc41a4fb012147d31ef1010242d000fb147cc9085a46bcfbf1fb97190bf13000787048f21f50c5f2eb109046642ca4fb002033d31ef1020232d00bfb11c14009b1fbf0f244f6d35302f13005c1f26203bd70b4f57a7fa4fb033523d31ef10303c34617d002fb1010a90941f25973b0fbf1f2cdf2b713a4fb033502f13003fb7002fb110742f21070043684424fea5534a9d209e0019e07e0013605e0023602e0019e00e00336c346029900270bf806701bf80700002850d00beb0704607838b3a07838b3e07838b3207938b3607938b3a07938b3e07938b3207a38b3607a38b3a07a38b3e07a38b3207b38b3607b38b3a07b38b3e07b38b3207c38b3607c38b3a07c38b3e07c38b31437502fd0d13ae0013722e0023720e003371ee004371ce005371ae0063718e0073716e0083714e0093712e00a3710e00b370ee00c370ce00d370ae00e3708e00f3706e0103704e0113702e0123700e013374f2f13d84ff075000bf807000ed00beb070273204e2f507008d020204d2f907004d070204c2fd07040f0b78200208df86300d1f8d4604ff0000a1bf80a10002967d00beb0a04617859b3a17861b3e17869b3217971b3617979b3a17981b3e17989b3217a91b3617a99b3a17aa1b3e17aa9b3217bb1b3617bb9b3a17bc1b3e17bc9b3217cd1b3617cd9b3a17ce1b3e17ce9b30af1140abaf1500fced14ff0500a37e00af1010a34e00af1020a31e00af1030a2ee00af1040a2be00af1050a28e00af1060a25e00af1070a22e00af1080a1fe00af1090a1ce00af10a0a19e00af10b0a16e00af10c0a13e00af10d0a10e00af10e0a0de00af10f0a0ae00af1100a07e00af1110a04e00af1120a01e00af1130a01240a2e1ed364224ff47a7342f2107704eb84014900b6fbf1f50a2d11d304fb02f1b6fbf1f50a2d0bd304fb03f1b6fbf1f50a2d05d37c43b6fbf4f10929e7d800e00c46d646baf14f0f98bf4ff04f0ecef1000842f2107c18eb0a074dd0b6fbf4f14cf6cd4001f13002ccf6cc400bf80a200a2ca4fb003241d37b1c3dd001fb1461d208b1fbf2f548f21f5005f130030beb0a06c5f2eb107370642ca4fb000330d3b81c29d005fb12115a09b1fbf2f5b4f57a7f05f13000b07044f6d350c1f26200a4fb000320d3f81c16d005fb1210990941f25973b0fbf1f2cdf2b713a4fb033502f13003f37002fb11060af1040a64454fea5534afd209e0f24607e00af1010a04e00af1020a01e00af1030a039f00220bf80a201bf80200002850d00beb0200417839b3817839b3c17839b3017939b3417939b3817939b3c17939b3017a39b3417a39b3817a39b3c17a39b3017b39b3417b39b3817b39b3c17b39b3017c39b3417c39b3817c39b3c07c38b31432502ad0d132e0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a0bd84ff075000bf8020006d00beb020073214e2a417040f0538100208df863009df8140080b102220beb020111f8013c63b11bf8023063b14b784bb1897804320029f1d1023a04e0002205e0013a00e0013202eb42014a0042eae27107f5e64c8f1c01f1010e07f0030827f003074ff0ff3602e001360d2e70d006eb8601bef1030f0ceb811505d24ff0ff34b8f1000f32d1efe7002402e00434a74228d004f11f01ca09042a04d849086a5c02f0f0026a5404f12001ca09042a04d849086a5c02f00f026a5404f12101ca09042a04d849086a5c02f0f0026a5404f12201ca09042ad9d849086a5c02f00f026a54d3e7013cb8f1000fbdd004f12001ca09042a08d849086a5ce3076ff00f0308bf0f231a406a54b8f1010facd004f12101ca09042a09d849086a5ce3074ff00f0308bf6ff00f031a406a54b8f1020f9ad004f12201ca09042a95d849086a5ce3076ff00f0308bf0f231a406a548be7002800f0ab80039a42f6780c47f21031c0f2000c02eb010a20220df1140efc4440f27d2b40f27a2807e01ef8010f063200280af1030a00f09180a0f17f0111f15f0ff2d300eb40000ceb8000a0f5c0700027d409514604e002370c2f01f52071e3d0c357042c06d8b3f1ff3f03dc0e7846f0f0060e70042cdeb206d816f0400303d00b7843f00f030b70b30605d55a4503d84b7843f0f0034b70f30606d5b2f51f7f03d84b7843f00f034b7033074fea920305d59e2b03d88d7845f0f0058d70750705d5424503d88d7845f00f058d70c51995f90160042c08d8b6f1ff3f05dc91f8405145f0f00581f84051042cf6b208d816f0400505d091f8405145f00f0581f84051b50607d55a4505d891f8415145f0f00581f84151f50608d5b2f51f7f05d891f8415145f00f0581f84151350707d59e2b05d891f8423143f0f00381f8423173077ff588af42453ff685af91f8423143f00f0381f842317de7ddf80ca0fff71db900218170ace60020107148e50020d070fff787bb00201072fff776b9f0b581b041f204054cf65561cef20005ccf2ac51c5f8ac1f4ef6fc51cef200010a6843f6fc7642f080720a6055f8041cc2f2000641f0010145f8041c316807460a466ff39602b2f1005f06d108684ef66062ccf2ff02904240d044f6d341c0f247014ff409708847002870d001460020002200bf8b1888540432b2f5097f58709870d870f6d14ef66060ccf2ff000860012081f8ce004ff0ff30a1f8e000a1f8e200a1f8e400a1f8e600a1f8e800a1f8ea00a1f8ec00a1f8ee00a1f8f000a1f8f200a1f8f400a1f8f600a1f8f800a1f8fa00a1f8fc00a1f8fe003160d1f8d800b8bb44f6342245f6e464c2f20702cff6f8741368204600bf16689e420ed116689e420bd116689e4208d116689e4203d1002800f10400efd19e421ad02b6816681068b0420ed11068b0420bd11068b04208d11068b04203d1002c04f10404efd1b04206d02868c01ac1f8d80001e0002030602868386001b0f0bd00bf2de9f04141f2040843f6fc77cef20008c2f200070146d8f8004038680d6801466ff39601b1f1005f06d101684ef66062ccf2ff0291423fd044f6d341c0f247014ff409708847002846d00021002200bf831881540432b2f5097f59709970d970f6d14ef66061ccf2ff010160012180f8ce104ff0ff31a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe103860d0f8d81081b144f6d350c1f26200a1fb0001880901284ff0010088bf88094be000203860fa2047e044f6342245f6e466c2f20702cff6f8761368314617689f420ed117689f420bd117689f4208d117689f4203d1002901f10401efd19f422ad0d8f80030176800bf1168b9420ed11168b9420bd11168b94208d11168b94203d1002e06f10406efd1b94214d0d8f8001044f6d357ca1ac1f26207a2fb0776c0f8d820b00901284ff0010088bfb009994208bffa2000e0fa20611bb1fbf0f0bde8f08100bf2de9f04f85b043f6fc76c2f200063568804628466ff3960044f6d344b0f1005fc0f2470406d128684ef66061ccf2ff0188423bd04ff40970a0470546a8b30020002100bf6a1868540431b1f5097f50709070d070f6d14ef66060ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe003560b8f1000f18bf002d07d14af26950c0f2450005b0bde8f04f0047d8f80cb0bbf1000ff2d0d8f820a0baf1000fedd0a94659f8040f00287bd0686900287ad0686a002879d0686b002878d0686c002877d0686d002876d0686e002875d0686f002874d0d5f88400002872d0d5f89400002870d0d5f8a40000286ed0d5f8b40000286cd0d5f8b00029690490d5f8a0002a6b0390d5f8900000260290d5f880002f6f0190286ad5f860e0d5f850c02b6c884238bf014638bf01268a423cbf114602268b423cbf194603268c453cbf614604268e453cbf714605268f423cbf39460626019888423cbf01460726029888423cbf01460826039888423cbf014609260498884238bf0146d5f8c00038bf0a26884238bf0b2609eb0610406804f1440137018847002049f80700012085f8df0016e0002614e0012612e0022610e003260ee004260ce005260ae0062608e0072606e0082604e0092602e00a2600e00b265046a04700283ff451af0af0030c5fea9a034ff0000219d00496a2eb830e431c0bf101066ff0030700bff119cc78da19d4700c79043714714c79547189790eeb070404349171f0d1049e3a1dbcf1000f10d01bf80230bcf1010f83540ad0531c1bf80370bcf1020fc75403d0911c1bf80120425409eb06114860d5f8c400320149f80280421cc1f808a0c5f8c420c8600ce738464146fff7aebe2de9f04f81b043f6fc79c2f20009d9f80050044628466ff3960044f6d34816460f46b0f1005fc0f2470806d128684ef66061ccf2ff0188423dd04ff40970c0470546002800f09580002000216a1868540431b1f5097f50709070d070f6d14ef66060ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe00c9f8005005f1040b4ff0000a4ff0000900bf4ff0ff30002200234ff0ff3105e000bf6032c02a03f1060332d0af187e68a64204d13e6986423cbf194630467e69a64204d13e6a86423cbf591c30467e6aa64204d13e6b86423cbf991c30467e6ba64204d13e6c86423cbfd91c30467e6ca64204d13e6d86423cbf191d30467e6da642ced13f6e87423cbf591d3846c8e700bf002910d40beb01104768090182684bf801a02046394600f013f8814608f1440138468847ace7484601b0bde8f08f204639463246c9f8005001b0bde8f04fffe72de9f047a4b0804640f6bb4043f6fc77c0f24e0091468a46c2f2000780473c68002021466ff39601b1f1005f02908df80c0006d120684ef66061ccf2ff0188423ed044f6d341c0f247014ff4097088470446a0b300200021621860540431b1f5097f50709070d070f6d14ef66060ccf2ff002060012084f8ce004ff0ff30a4f8e000a4f8e200a4f8e400a4f8e600a4f8e800a4f8ea00a4f8ec00a4f8ee00a4f8f000a4f8f200a4f8f400a4f8f600a4f8f800a4f8fa00a4f8fc00a4f8fe003c60baf1000f4ff0010618bfb9f1000f20d101af3846fff714fc02ad404651464a460123009500f042fc05463846fff7b6fc002e064608d19df80c0028b943f61f00c0f247004c308047002c18bfc4f8d06022e09af8000008280ed9a0f18301052905d8012202fa01f111f0290f09d100f07f000928ccd104e00121814011f4a47febd03cb143f61f00c0f24700804794f81c0228b14ff0ff35284624b0bde8f0870026b5e743f6fc70c2f20000016808466ff39600b0f1005f16d108684ef66062ccf2ff0290420fd1d1f8fc0160b144f63422c2f207021268801a0028cebf01200020c1f8fc01704700207047f0b101684ef66062ccf2ff02914218bf704790f8061299b110b544f62f344ff0000cc0f24604864680f806c20120002100220023aef804c2a446bde810406047704700bf2de9f04143f6fc77c2f200073f684ff000083c466ff39604b4f1005f07d13e684ef66065ccf2ff05ae4208bfb84601280fd11c4615460f460646fff79bff2346044639462a463046002c18bfb8f1000f06d144f62f3cc0f2460cbde8f041604798f8060270b1d8f800020021002888f80612a8f804123ed049f2d941c0f24401884738e0b8f804020121013080b2012898bf0846a8f80402d8f8000249f2d944c0f2440488f8061268b94ff60370cff6ff70a4f594777844002142460023b847c8f8000240b1a047d8f80002a4f140024ff4c8719047c8b198f80602002808bfbde8f081d8f80002002188f80612a8f8041200b1a04744f62f3cc0f2460c0120002100220023bde8f04160474af26950c0f245008047012830d1082088f80702032088f80802102088f80902002088f80a02b22088f80b02062088f80c0288f80d024620b8f8041288f80e02432088f80f0201200f0a45f6153c08f2072288f8100288f8110288f81212c0f2470c09210d2388f81372bde8f0416047bde8f08170b50446d0f8000249f2b1360d46c0f2440668b94ff61d60cff6ff707844002122460023b0470028c4f8000208bf70bd06f594718847d4f8000206f1e8022946bde87040104700bf2de9f04f83b04768002f00f001828368002b00f0fd8143f6fc7e07eb03094ff0000cc2f2000e0026002410e04ff0000c0299ae46c5f800c030463a4608eb0b0300264b451f464ff0000480f0e181ba461af9013b03f07f05b540002b44ea050410d404f00703012b16dc0bb3012b40f0cf81a9eb0a03082bc0f0ca8107f10903dee700bfca4580f0c381182e06f107065746dcd9bce100bf022b3ad0052b40f0b781a9eb0a03042bc0f0b2817b1dc7e7ca4580f0ad8197f90130002b07f10203bed54b4580f0a48197f90230b3f1ff3f07f10303b4dc4b4580f09a8197f90330b3f1ff3f07f10403aadc4b4580f0908197f90430b3f1ff3f07f10503a0dc4b4580f0868197f90530002b00f18181bb1d96e7ca4580f07c8197f9013007f10208002b03f07f0b1fd5c84580f0718197f90260fb1c06f07f05b6f1ff3f4beac51b02ddc24698460fe04b4580f0618197f9036007f1040806f07f05b6f1ff3f4bea853b40f3ae809a46a9eb08039b4500f24f8124f00703b3f54a7f7ff45fafbbf1060ffff45baf98f80030462b7ff456af9af80230432b7ff451af9af80330012b7ff44cafdef8004023466ff39603b3f1005f06d123684ef66065ccf2ff05ab424fd0029144f6d34106464ff40970c0f2470175461746884700283ff427af02990446002330463a464ff0000cae4600bfe71804f803c00433b3f5097f87f801c087f802c087f803c0f2d14ef66063ccf2ff032360012384f8ce304ff0ff33a4f8e030a4f8e230a4f8e430a4f8e630a4f8e830a4f8ea30a4f8ec30a4f8ee30a4f8f030a4f8f230a4f8f430a4f8f630a4f8f830a4f8fa30a4f8fc30a4f8fe30cef800409af804309af805709af80660032b47ea062740dc012b49d0022b00f08480032b7ff4dbaecde901208a4665467646fff78cfd019a03460298b646ac465146002b3ff4cbae94f80632002b3ff4c6ae204641f28831a4f804726446fff77cfe5ce0c84580f0a48097f904607b1d06f07f05b6f1ff3f4bea455b3ff732af4b4580f0968097f90560002e00f1918007f106084bea067b36e7042b15d0052b6ad0062b04bfc4f820c284f81ec296e644f63423c2f207031b6845f69075c0f201052b44c4f8fc3189e6cde901208a4665467646fff73bfd019a03460298b646ac465146002b3ff47aae94f80632002b3ff475aeb4f80432bb427ff470aed4f8003284f806c2002ba4f804c23ff467ae49f2d9411846c0f2440164468847dde90120b646a446514659e694f80632c4f8fcc1002b3ff453ae0646d4f8000275468a46174684f806c2a4f804c220b149f2d941c0f24401884744f62f340120002100220023c0f24604a04730463a4651464ff0000cae4632e6d4f8203253b144f63425c2f207052f68db1b002bd8bf84f81ec201e084f81ec244f63423c2f207031b6845f69075c0f201052b44c4f8203215e640f22113c0f2490303b0bde8f04f18477fb50646002806d1fff7c0fc002807d19de80f00064641f6d67cc0f24e0c60477fbd00bf092960d12de9f047a22602eb030cd65406268cf8016041f2bc78c0f200084ff0000ef84418f80e700ceb0e0508eb0e06ef707778b47896f8039096f804a02f716c7185f8069085f807a074790ef11e0e2c72b479bef13c0f6c72f479ac72347aec72747a2c73b47a6c73f47aac73347bec73747b2c74b47b6c74f47bac74347cec74747c2c75b47c6c75f47cac75347dec75747d2c76b47d6c76f47dac76347eec76747e2c77b47e6c77f47eac77347fec77747f85f82040b4d13b273e338cf80270bde8f04745f6153cc0f2470c60474df63040c2f234000078042818bf704780b582b04af26b1e4ff0000cc0f24d0e0020002100220923cdf804c0cdf800c0f04702b080bd00bff0b583b04df63043c2f234031b784ff6e704042bc0f2450420d144f2d043c2f207031b680546184616460f46a04703463946324628468bb11b68e02b0ed14af26b160027c0f24d060020002100220a2301970097b047012003b0f0bd04f1160303b0bde8f04018472de9f04f95b0002918bf002a04d115b0bde8f04f00f03abc0f78ddf878a007f07f06072e08dd082e00f09d80092e00f0e880422eebd0eae1052e00f07281072e40f0e58143f6fc74c2f20004206803466ff39603b3f1005f06d103684ef66067ccf2ff07bb4241d00e4644f6d341c0f247014ff4097015468847a0b300210022831881540432b2f5097f59709970d970f6d14ef66061ccf2ff010160012180f8ce104ff0ff31a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1031462a462060022a2cbf4978ff21002800f0b88302294ff0000500f0f282012900f0eb82002940f0ae834ff0ff31c0f8dc50a0f8cc50c0f8c850a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1080f8005182e3002b4ff0ff3500f07e834af65913cff6fe73d71802339f42c0f0758391f80190b9f1000f00f0ed8102274ff00108bc1c944200f2ff82cb19cf5d5b7857ea032300f0f8821f19974200f2f4820e5d092e0bd9833e062e4ff0ff3500f2548308fa06f616f0490f05d14de308fa06f515f4127feed015460e4621441a4600230446cdf800a0fff709ff002840f0d382b9f1010931462a462046c9d1b2e13f064ff0210658bf1126b242c0f0c482002f01f101060ed54af26952c0f245020f4604461d4690472b4601462046022918bf07f11106317972794ff0ff3551ea022b1ebfb179f27951ea022900f00d83317b727b41ea02218b4540f00683b17bf27b41ea0221894540f0ff823178727841ea02210beb0102b2f5117f00f2f582b278f47842ea042209eb0204b4f5967f00f2eb82347a777a44ea07280beb0807b7f5117f00f2e182b77af67a47ea062609eb0607b7f5967f00f2d782c468002c00f0d382b0f84070b0f842507d4345f2d837c0f20107bd42c0f05e8206906019a0f5a8301f46a0f576704346cde901b9009600f0d6fbdaf800000f280bd80aebc0010130a1f806800e81a1f80ab0a1f80c90caf80000002f069840f02481a3e243f6fc75c2f20005022a2cbf91f801804ff0ff082c6820466ff39600b0f1005f06d120684ef66063ccf2ff03984245d00f4644f6d341c0f247014ff4097016468847002800f00381044600200021324600bf631860540431b1f5097f58709870d870f6d14ef66060ccf2ff002060012084f8ce004ff0ff303946a4f8e000a4f8e200a4f8e400a4f8e600a4f8e800a4f8ea00a4f8ec00a4f8ee00a4f8f000a4f8f200a4f8f400a4f8f600a4f8f800a4f8fa00a4f8fc00a4f8fe002c6094f8080178b1d4f8040148b149f29943c0f2440340330d461646984732462946002084f808010120032a80f0b980c5e0f51e18bf0125b41f18bf0124032afff4f7ad25407ff4f4ad00254c1ca2f1010c8df81c508df81d508df820508df824508df825508df826508df827508df828508df829508df82a508df82b508df82c508df82d508df82e508df82f508df830508df831508df832508df833508df834508df835508df836508df837508df838508df839508df83a508df83b508df848508df849508df84a508df84b508df84c508df84d508df84e508df84f508df850508df851508df852508df85350cde9074c4df62f04cff6ff747c440f944df63304cff6ff747c44032e109411957cd0062e40f054810646002000211d4600f0d5fcf068002800f04a81b6f84020b6f84210514345f2d832c0f201029142c0f03e810844a0f5a830a0f5767107a84ff491724ff4967300f08bfd002800f02f81daf800000f280dd80aebc0010022ca800a814ff411724a814ff4967201308a81caf80000002d304600f08181514600f009fa7ce100202860002439463246032a0dd3b8f1000f0ad18878082800f26f8142f6c521c0f250019631884767e1052a19d3b8f1010f16d188780025421e062a00f25e81cb78032b00f25a810a79002a00f0568142f6c521c0f2500101f59a771946b8474be1b8f1020f40f08a8042f6c520c0f25000804741e13f0600f1b680082ac0f0d4804ff0070e4ff0050c01240e1996f802904ff0ff35b9f1000f00f02f81f778002f00f02b8111f804804fea890b0beb8804b4f5117f00f2218174787e0006eb4407b7f5967f00f21981069001eb0c000d4611f80c104078774641ea002081b20120cde9043200f027fc002840f005810699c868002800f09880b1f84020b1f84210514345f2d832c0f201029142c0f08c8008444ff4117114fb0101e819079005984fea4902c01b089001eb4800a0f5a830a0f5767107a8334600f0cffc002873d0daf8001004980f290cd84fea880263000aebc1070131fa803b81a7f80ab0be81caf80010002806987ff445afc4e0012180f8ce10c1e080f8ce50bee0072a56d3b8f1030f53d18878cb780a7940ea03204d798e7901284ff0010498bf204644f62061884228bf084642f6c521c0f25001642a28bf642201f5e2731146984744f20450c2f207000068002800f0958045ea062149f29942012988bf0c46c0f244022146904788e00c2a1ed3cf78ce79b7421ad10f790e7ab74216d14af26954c0f245040d46164680461f46a0473b46324629460646404605244ff00b0e4ff0090c022e08bf012430e74ff0ff3565e0032a4ff0000561d3a8f10403b3fa83f35b0918405ad0d01e4cf6cd42ccf6cc428b78a0fb0202b3eb920f88bf9308302b184628bf3020002b4cd000eb800303f0030c03f4fe770023ce18f578e21882f80a513579043382f80b5175799f4282f80c51b67982f80d61eed1bcf1000f10d01944ca782344bcf1010f83f80a2108d00a79bcf1020f83f80b211cbf497983f80c1184f80801d4f8040149f29946c0f24406002184f8091168b94df2cb40cff6ff70a6f1e8077844224600230025b847c4f8040148b10121b0470025284615b0bde8f08fa4f80851f8e742f6c520c0f2500084f808518047f0e700bff0b583b043f6fc73c2f200031f683b466ff39603b3f1005f09d13b684ef66066ccf2ff06b34204bf002387f81e32002958d0362a56d30b78422b53d14b784d2b50d10b7f4f7f43ea0723042b4ad18b7dcf7d0e7e43ea072343ea06434f7e8e7ccd7c53ea076346ea05270e7d4d7d47ea064747ea05641d4648bf5d42b0f84070002b4ff00003c8bf0123bc422ad1b0f84270bd4226d18f7ace7a91f80cc047ea06274e7b47ea0c4747ea0667974219d2621c032606eb5202866822f0030cca19cde901c30746304621462346009500f0bffd3846314622462b4600f053fe002003b0f0bd4cf2af53c0f24d0303b0bde8f04018472de9f04182b043f6fc77c2f200073d680c4629466ff39601b1f1005f064606d128684ef66061ccf2ff0188423ed044f6d341c0f247014ff4097088470546a0b3002000216a1868540431b1f5097f50709070d070f6d14ef66060ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe003d60f068002818bf002d02d102b0bde8f081b6f84010b6f84220514345f2d832c0f201029142f1d30844a0f5a830a0f57670c5f818024ff001084ff4f07085f81c8201904ff4207044f267060090c0f2470600200021002200230027b04730b185f81c72c5f8187202b0bde8f08184f8048002b0bde8f08100bf2de9f04f8bb0dde91569964643ea01023243d207804640f0c88070084ff0ff37069001284ff0010207eb560088bf7208089002f003000990c6f341006ff00107059007eb56006ff0020708eb530c019007eb560008eb510a009022f003020cf10100544203900af101004ff0000b4ff49175cdf828c00290cdf810a006e000bf0bf1010b159ecb4500f0b98114985f466fea0b02704588bf09eb020707eb0e0207440a9802fb05a807fb050c8b4235d9059e069ab6b10898012e18f800200cf8002002460ed00198022e18f800200cf80020024606d0009818f800200cf80020024600bf08980328cad300bf08eb020616f8017c0ceb020000f8017c16f8027c043a00f8027c16f8037c00f8037c16f8046c00f8046ce9d1b2e700bf082e01d2002227e04ff4917002fb00f607fb00f203986ff0030a02440298871907eb0a00c67802eb0a0989f8036006790af1040a89f80460467989f80560807904eb0a06043689f80600e9d10af10402ddf85890ddf810a0099800283ff482af099e18f80200012e0cf802003ff47aaf501c099f18f80060022f0cf800603ff471af901c18f800200cf800206ae74ff6fc70304006f003020a90701e00270590cde9068e089206e0099fddf8589001374f4500f01681149cf8433a467445099788bf09eb000202eb0e004ff4917500fb058c101900fb05894ff0000a042ec0f09480ddf814b000bf50468b4288bf584600eb010500eb03074fea55001cf800806ff0010080ea0a000af1010288bf32186ff002008aea00040af1020088bf30196ff003048aea040e0af1030488bf06eb0e0408f00f06ed074fea570e002d08bf4fea181619f80e50ff0705f00f0705f0f005354408bf47ea0615571809f80e507e081cf806601a44ff0706f00f054fea520708bf350919f80760d20706f00f0206f0f0062e4408bf42ea0516421809f8076057081cf807701844d20707f00f064fea500208bf3e0919f80270c00707f00f0007f0f007374408bf40ea0617601809f8027042081cf80220e718c00702f00f064fea570008bf160919f80020ff0702f00f0702f0f002324408bf47ea061209f800200a98159e0af1040a8245abf1040b7ff471afdde9068e089a002a3ff44baf6fea0a0052468b4288bf3218501844081cf804401a44c0074fea520004f00f0519f8007008bf2509d20707f00f0407f0f007089a2f4408bf44ea0517012a09f800703ff428af0af10102a6eb0a0b8b4288bfabf10202541865081cf805501a44e4074fea520405f00f0719f8040008bf2f09d20700f00f0500f0f000089a384408bf45ea0710022a09f804003ff403af0af102008b4288bfabf10300421854081844d2071cf804704fea500219f8024007f00f0508bf3d0904f00f0704f0f0042c44c00708bf47ea051409f80240e2e60bb0bde8f08f70b543f6fc76c2f2000632680c4611466ff39601b1f1005f054606d110684ef66061ccf2ff01884240d044f6d341c0f247014ff409708847002800f08180024600200021531850540431b1f5097f58709870d870f6d14ef66060ccf2ff001060012082f8ce004ff0ff30a2f8e000a2f8e200a2f8e400a2f8e600a2f8e800a2f8ea00a2f8ec00a2f8ee00a2f8f000a2f8f200a2f8f400a2f8f600a2f8f800a2f8fa00a2f8fc00a2f8fe0032600120002d82f8cc0047d0104630f8e01fa1423bd0b2f8e210a14237d0b2f8e410a14233d0b2f8e610a1422fd0b2f8e810a1422bd0b2f8ea10a14227d0b2f8ec10a14223d0b2f8ee10a1421fd0b2f8f010a1421bd0b2f8f210a14217d0b2f8f410a14213d0b2f8f610a1420fd0b2f8f810a1420bd0b2f8fa10a14207d0b2f8fc10a14203d0b2f8fe10a1420ad1012082f8de0070bd0020306070bd82f8cd00002070bd92f8cd1081b9b2f8c810611a0bb2b3f1ff3f06dd89b2022924bf012182f8dd1002e0012182f8dc10b2f8ca30002182f8cd109c42a2f8c84088bfa2f8ca4092f8001120f81140481c00f00f0082f80001002070bd00bf2de9f04fcdb04ef687249346c0f25b044df2546298460e4604f13c07c0f278020f2138230546b84718b12846a047002423e20bfb08f040000b960295059001250da94ff4807004f585724ff0000947464ff000084ff0000a00235e4604930a930697cdf820b00192029ce1602061204600219047e1680daa891a07910da900f0e681ddf82ce00021002400900be000bf04940c9c002101234ff0030a07980134844200f0d181002940f0e0810da80c94045dbaf1020febd0baf1010f00f09280baf1000f40f0968004f00f000a900598210900f0a6808842c0f08880401a05900a9800eb00140001039014e01cf809000a9a00f0f00010440cf8090009f1010901390125b14524bf4ff0000908f10108002900f08c81b8454ff0000a4ff0000338bf012380f002814ff4917008fb00ec002ddbd0cdf82480a846a6eb0905b5eb510f88bf4d088db3a8080ceb090a20d000270af10102a7eb80006ff0030600bf02eb060e043600eb060b1bf104078ef803408ef804408ef805408ef80640efd1301d069f089eddf82ce015f0030204d10ce0002015f0030208d0012a0af8004004d05044022a447018bf8470a1eb4501a94489b1b14510d21cf80900039a00f00f001043ddf824800cf80900013900250029a0d12be100bf00214546ddf8248090e700bfbcb10598a04228d201214ff0000a21e0ddf810b005985bea042b16d00c9c5845cdf810b080f0938001214ff0000a002342e70c9c002101234ff0020a3ce70c9c00214ff0010a012336e7002001214ff0000a04900c9c00232ee7001b05900a9800eb00110001099015e000bf1bf809200a9802f0f00202430bf8092009f10109013c0125b14524bf4ff0000908f10108002c00f0da80b8454ff0000a4ff0000338bf012350d24ff4917008fb00eb002ddcd0ac46a6eb0905b5eb540f88bf650855b3ae080beb090a18d000200af10102a0eb860e6ff00306901904360eeb06070437c170017141718171f5d1069fddf82ce0321d15f0030604d10de0002215f0030609d0012e0af8021005d05244022e517018bf917000bfa4eb4504a9447cb1089eb1450ed21bf80900099a00f00f0010430bf80900013c0025002cabd184e0089e002465469de70c9c0121b4e6a0eb0b0005900a9800eb00110001099015e01cf809000a9a00f0f00010430cf8090009f10109abf1010b0125b14524bf4ff0000908f10108bbf1000f65d0b8454ff0000a4ff0000338bf01235bd20b984ff4917208fb020c002ddad0c646a846a6eb0905b5eb5b0f88bf4fea5b0545b3a8080ceb090a17d000240af10102a4eb80006ff003069719043684190434f97039717971b971f6d1301d069f089e0c9c15f0030204d10ce0002015f0030208d0012a0af8001004d05044022a417018bf8170abeb450bbbf1000fa94411d0b14511d21cf80900099a00f00f0010430cf80900abf1010b0025f046bbf1000fa6d10be04ff0000b4546f04697e70c9c4ff0000a002131e6012102e04ff0000a0021ddf82ce029e600980da973b1012817d04ff0000450b90798019ab0fa80f040094ff480703ff4ffad00e0002402984ef68721c0f25b01884720464db0bde8f08f059840ea0a00b0fa80f04409eee72de9f04f83b00c9e0292002e019000f08e80019823f00304471c029803f0030ac4f1000c01384ff00008009005e000bf08f10108b0450f4479d00e98c14600286fea080418bf06eb0409002bf0d0042b06d24ff0000bbaf1000f2ed1e8e700bf0d98b64609fb00f400986ff003050444607800f0f00242ea10107a19d0706078043500f00f0646ea0010107114f8020f00f0f00646ea10105071207800f00f0646ea00100ceb050604369071e0d105f1040b7646baf1000fbad002980d9a4fea5b0509fb0204019814f805e008fb01050ef00f025feacb7908bf4fea1e1242ea0212baf1010f05f80b20a1d00bf1010e4fea5e00205cb9f1000f4fea101208bf00f00f0242ea0210baf1020f05f80e008ed00bf102004208a25cb9f1000f02f00f0408bf140944ea04122a5480e703b0bde8f08f2de9f04182b003fb02f68846cde9001645f20f1107466846c0f247011c461546884740f2196047f8240f788948f2816245ea0040b86045ea044057f8204c7860c0f2490220463946fe60c7f81080904740f25761c0f244012046884702b0bde8f0814556454e4346572f3520696d6735373620696d6735383020696d677a20726c652077616b656c6561736520646972656374666220666267756172640000000000000000000000000000002020202020002020000000505050000000000000000000005050f85050f85050000000002070a8a07028a8702000000048a85010202854480000000020505020689090680000002020200000000000000000000010204040404020100000000040201010101020400000000000005020f82050000000000000002020f82020000000000000000000000020204000000000000000f800000000000000000000000000202000000000080810102020404000000000708898a8c88888700000000020602020202020700000000070888808102040f8000000007088083008088870000000000818284888f8080800000000f88080f00808887000000000708080f08888887000000000f808081010202020000000007088887088888870000000007088888878080870000000000000202000002020000000000000202000002020400000000008102040201008000000000000f80000f8000000000000004020100810204000000000708888102000202000000000708898a8a89880780000000070888888f888888800000000f08888f0888888f000000000708880808080887000000000e0908888888890e000000000f88080f0808080f800000000f88080f0808080800000000070888080b888887000000000888888f888888888000000007020202020202070000000003810101010909060000000008890a0c0c0a090880000000080808080808080f80000000088d8a8a888888888000000008888c8a89888888800000000708888888888887000000000f0888888f080808000000000708888888888a87008000000f0888888f0a0908800000000708880700808887000000000f8202020202020200000000088888888888888700000000088888850505020200000000088888888a8a8d88800000000888850202050888800000000888850502020202000000000f8081020408080f8000000007040404040404070000000004040202010100808000000007010101010101070000000205088000000000000000000000000000000000000f80040200000000000000000000000000000700878888878000000008080f088888888f00000000000007088808088700000000008087888888888780000000000007088f8808078000000001820702020202020000000000000788888888878087000008080f08888888888000000202000602020202070000000080800180808080808483000004040485060605048000000006020202020202070000000000000f0a8a8a8a8a8000000000000f08888888888000000000000708888888870000000000000f088888888f0808000000000788888888878080800000000b8c0808080800000000000007880700808f00000000020207020202020180000000000008888888888780000000000008888505020200000000000008888a8a8a870000000000000885020205088000000000000888888888878087000000000f810204080f800000000182020402020201800000000202020202020202000000000601010081010106000000048a8900000000000000000", + "new": "02fb01f044f6d341c0f24701084700bf084644f61751c0f24701084770b500284ed001684ef66162ccf2ff02914218bf70bd90f8081190f8095142f6c52c8d42c0f2500c2ad205eb8501014491f80d2191f80e4191f80ae191f80b3191f80c1142ea0424012c4ff0010298bf14466e1c054680f80961b9b164294eea032028bf6421012888bf024644f62060824228bf02460cf5e2731046984706e0002180f80811bde870406047e047d5f8040138b149f29942c0f244022146bde87040104770bd00bf2de9f04f99b043f6fc76c2f20006d6f8009048466ff39600b0f1005f40f04c81d9f800004ef66165ccf2ff05a84240f0438199f81c02002800f02d81d9f81842002c00f0288140f2b870c2f20000d0f8008004a801f07af8b8f1000f00f0708140f2030c45f24077cff6807ca4f1600008f160026ff0bf03c0f20207016ed4182166416ec0336166816ebb42a166c16ee166016f2167416f6167816fa167c16fe167d0f88010c4f88010d0f88410c4f88410d0f88810c4f88810d0f88c10c4f88c10d0f89010c4f89010d0f89410c4f89410d0f89810c4f89810d0f89c10c4f89c10d0f8a010c4f8a010d0f8a410c4f8a410d0f8a810c4f8a810d0f8ac10c4f8ac10d0f8b010c4f8b010d0f8b410c4f8b410d0f8b810c4f8b810d0f8bc10c4f8bc1050f8c01fc4f8c0104168c4f8c4108168c4f8c810c168c4f8cc100169c4f8d0104169c4f8d4108169c4f8d810c169c4f8dc10016ac4f8e010416ac4f8e410816ac4f8e810c16ac4f8ec10016bc4f8f010416bc4f8f410816bc4f8f810c16bc4f8fc10016cc4f80011416cc4f80411816cc4f80811c16cc4f80c11016dc4f81011416dc4f81411816dc4f81811c16dc4f81c117ff462afd6f800e00eea0c00b0f1005f40f08080def80000a8427bd19ef8ce00002840f0c5809ef8dc00002100288df8141000f0258105aa505c002800f0f88053185878002800f0ce809878002800f0cc80d878002800f0ca801879002800f0c8805879002800f0c6809879002800f0c480d879002800f0c280187a002800f0c080587a002800f0be80987a002800f0bc80d87a002800f0ba80187b002800f0b880587b002800f0b680987b002800f0b480d87b002800f0b280187c002800f0b080587c002800f0ae80987c002800f0ac80d87c002800f0aa8014315029abd1cae099f81e0268b1d9f8200238b144f63421c2f207010968401a002870dc002089f81e024cf61520c0f2460019b0bde8f04f004744f6d341c0f247014ff409708847002842d00021002200bf831881540432b2f5097f59709970d970f6d1012180f8ce104ff0ff310560a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1010e0002089f81c02c9f8180289f81e02012089f81d024cf61520c0f24600804714e000203060002089f81c02c9f818024ff4163045f20f11069005a8c0f24701cdf814808847012089f81e0204a800f08cffc9f8d40019b0bde8f08f013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f2921d84ff0520050541dd00a4445204e29507018d04f204d29907014d052204c29d07010d044204b2910710cd045204a29507108d052204929907104d020204829d07140f08c8600208df8630001219ef8dd00002870d0002205ab985c00284fd09f18787838b3b87838b3f87838b3387938b3787938b3b87938b3f87938b3387a38b3787a38b3b87a38b3f87a38b3387b38b3787b38b3b87b38b3f87b38b3387c38b3787c38b3b87c38b3f87c38b31432502ad2d13ce0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a15d84ff05300985411d013444b204e2a58700cd049204d2a987008d050204c2ad87004d020204b2a187140f0608100208df8630001319ef8de0000286cd0002105aa505c00284fd05318587838b3987838b3d87838b3187938b3587938b3987938b3d87938b3187a38b3587a38b3987a38b3d87a38b3187b38b3587b38b3987b38b3d87b38b3187c38b3587c38b3987c38b3d87c38b314315029d2d138e0013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f2911d84ff0440050540dd00a4455204e29507008d050204d29907004d020204c29d07040f0ec8000208df8630001219ef8df0000284dd0002105aa505c002800f0bc8053185878002800f092809878002800f09080d878002800f08e801879002800f08c805879002800f08a809879002800f08880d879002800f08680187a002800f08480587a002800f08280987a002800f08080d87a00287ed0187b00287dd0587b00287cd0987b00287bd0d87b00287ad0187c002879d0587c002878d0987c002877d0d87c002876d014315029b4d1d0e0002940f0d180002105aa505c002800f0b88053185878002800f08e809878002800f08c80d878002800f08a801879002800f088805879002800f086809879002800f08480d879002800f08280187a002800f08080587a00287ed0987a00287dd0d87a00287cd0187b00287bd0587b00287ad0987b002879d0d87b002878d0187c002877d0587c002876d0987c002875d0d87c002874d014315029b6d181e0013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f295ad84ff05300505456d00a444e204e29507051d041204d2990704dd050204c29d07049d04f204b29107145d046204a29507141d02020492990713dd00020d0713de00020107113e7002058719fe6013122e0023120e003311ee004311ce005311ae0063118e0073116e0083114e0093112e00a3110e00b310ee00c310ce00d310ae00e3108e00f3106e0103104e0113102e0123100e013314f290dd84ff04f00505409d00a444b204e29507004d020204d29907040f07b8400208df8630000220df1140b1bf80200002850d00beb0203587838b3987838b3d87838b3187938b3587938b3987938b3d87938b3187a38b3587a38b3987a38b3d87a38b3187b38b3587b38b3987b38b3d87b38b3187c38b3587c38b3987c38b3d87c38b31432502ad0d12be0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a04d84ff077000bf8020003d100208df8630003e00beb020000214170def8d07000261bf80600002851d00beb0602507840b3907840b3d07840b3107940b3507940b3907940b3d07940b3107a40b3507a40b3907a40b3d07a40b3107b40b3507b40b3907b40b3d07b40b3107c40b3507c40b3907c40b3d07c40b31436502ed0d1502624e0013622e0023620e003361ee004361ce005361ae0063618e0073616e0083614e0093612e00a3610e00b360ee00c360ce00d360ae00e3608e00f3606e0103604e0113602e0123600e0133601240a2f1ed364224ff47a7342f2107504eb84004000b7fbf0f10a2911d304fb02f0b7fbf0f10a290bd304fb03f0b7fbf0f10a2905d36c43b7fbf4f00928e7d800e004463046cdf804e0cdf80c804f2e98bf4f20c0f10008009018eb060e53d0b7fbf4f00a2c00f130010bf806104cf6cd41ccf6cc41a4fb012147d31ef1010242d000fb147cc9085a46bcfbf1fb97190bf13000787048f21f50c5f2eb109246642ca4fb002033d31ef1020232d00bfb11c14009b1fbf0f244f6d35302f13005c1f26203bd70b4f57a7fa4fb033523d31ef10303d34617d002fb1010a90941f25973b0fbf1f2cdf2b713a4fb033502f13003fb7002fb110742f21070043684424fea5534a9d209e0009e07e0013605e0023602e0009e00e00336d346019900270bf806701bf80700002850d00beb0704607838b3a07838b3e07838b3207938b3607938b3a07938b3e07938b3207a38b3607a38b3a07a38b3e07a38b3207b38b3607b38b3a07b38b3e07b38b3207c38b3607c38b3a07c38b3e07c38b31437502fd0d13ae0013722e0023720e003371ee004371ce005371ae0063718e0073716e0083714e0093712e00a3710e00b370ee00c370ce00d370ae00e3708e00f3706e0103704e0113702e0123700e013374f2f13d84ff075000bf807000ed00beb070273204e2f507008d020204d2f907004d070204c2fd07040f0b88200208df86300d1f8d4604ff0000a1bf80a10002967d00beb0a04617859b3a17861b3e17869b3217971b3617979b3a17981b3e17989b3217a91b3617a99b3a17aa1b3e17aa9b3217bb1b3617bb9b3a17bc1b3e17bc9b3217cd1b3617cd9b3a17ce1b3e17ce9b30af1140abaf1500fced14ff0500a37e00af1010a34e00af1020a31e00af1030a2ee00af1040a2be00af1050a28e00af1060a25e00af1070a22e00af1080a1fe00af1090a1ce00af10a0a19e00af10b0a16e00af10c0a13e00af10d0a10e00af10e0a0de00af10f0a0ae00af1100a07e00af1110a04e00af1120a01e00af1130a01240a2e1ed364224ff47a7342f2107704eb84014900b6fbf1f50a2d11d304fb02f1b6fbf1f50a2d0bd304fb03f1b6fbf1f50a2d05d37c43b6fbf4f10929e7d800e00c46d646baf14f0f98bf4ff04f0ecef1000842f2107c18eb0a074dd0b6fbf4f14cf6cd4001f13002ccf6cc400bf80a200a2ca4fb003241d37b1c3dd001fb1461d208b1fbf2f548f21f5005f130030beb0a06c5f2eb107370642ca4fb000330d3b81c29d005fb12115a09b1fbf2f5b4f57a7f05f13000b07044f6d350c1f26200a4fb000320d3f81c16d005fb1210990941f25973b0fbf1f2cdf2b713a4fb033502f13003f37002fb11060af1040a64454fea5534afd209e0f24607e00af1010a04e00af1020a01e00af1030a039c00220bf80a20cdf808901bf80200002850d00beb0200417839b3817839b3c17839b3017939b3417939b3817939b3c17939b3017a39b3417a39b3817a39b3c17a39b3017b39b3417b39b3817b39b3c17b39b3017c39b3417c39b3817c39b3c07c38b31432502ad0d132e0013222e0023220e003321ee004321ce005321ae0063218e0073216e0083214e0093212e00a3210e00b320ee00c320ce00d320ae00e3208e00f3206e0103204e0113202e0123200e013324f2a0bd84ff075000bf8020006d00beb020073214e2a417040f0528100208df863009df81490b9f1000f10d002220beb020111f8013c63b11bf8023063b14b784bb1897804320029f1d1023a04e0002105e0013a00e0013202eb4201490041eae1718a1c04f5207c01f1010e02f0030822f0030704f5a0724ff0ff3504e001350d2d02f5a07268d005eb8501bef1030f0ceb811405d24ff0ff31b8f1000f2dd1ede70021164603e08f4206f1020621d04b1cdb09042b03d8337803f0f00333708b1cdb09042b03d8737803f00f037370cb1cdb09042b03d8737803f0f00373700431cb09042bdfd84b08e05c00f00f00e054d9e70139b8f1000fc0d08e1cf009042808d87008235cce076ff00f0608bf0f2633402354b8f1010fb0d0ce1cf009042809d87008235cce074ff00f0608bf6ff00f0633402354b8f1020f9fd00e1df00904289bd87008c907235c6ff00f0108bf0f211940215491e7b9f1000f00f0ab80039842f64c0cc0f2000c00f2812a02220df1140efc4440f27d2b40f27a2808e01ef8019f0632b9f1000f0af1030a00f09280a9f17f0010f15f0ff1d309eb49000ceb8000a0f5c0700027d409514605e000bf02370c2f01f52071e1d0c357042c06d8b3f1ff3f03dc0e7846f0f0060e70042cdeb206d816f0400303d00b7843f00f030b70b30605d55a4503d84b7843f0f0034b70f30606d5b2f51f7f03d84b7843f00f034b7033074fea920305d59e2b03d88d7845f0f0058d70750705d5424503d88d7845f00f058d70c51995f90160042c08d8b6f1ff3f05dc91f8405145f0f00581f84051042cf6b208d816f0400505d091f8405145f00f0581f84051b50607d55a4505d891f8415145f0f00581f84151f50608d5b2f51f7f05d891f8415145f00f0581f84151350707d59e2b05d891f8423143f0f00381f8423173077ff588af42453ff685af91f8423143f00f0381f842317de7dde90298fff71ab900218170ade60020107147e50020d070fff784bb00201072fff773b9f0b581b041f204054cf65561cef20005ccf2ac51c5f8ac1f4ef6fc51cef200010a6843f6fc7642f080720a6055f8041cc2f2000641f0010145f8041c316807460a466ff39602b2f1005f06d108684ef66162ccf2ff02904240d044f6d341c0f247014ff409708847002870d001460020002200bf8b1888540432b2f5097f58709870d870f6d14ef66160ccf2ff000860012081f8ce004ff0ff30a1f8e000a1f8e200a1f8e400a1f8e600a1f8e800a1f8ea00a1f8ec00a1f8ee00a1f8f000a1f8f200a1f8f400a1f8f600a1f8f800a1f8fa00a1f8fc00a1f8fe003160d1f8d800b8bb44f6342245f6e464c2f20702cff6f8741368204600bf16689e420ed116689e420bd116689e4208d116689e4203d1002800f10400efd19e421ad02b6816681068b0420ed11068b0420bd11068b04208d11068b04203d1002c04f10404efd1b04206d02868c01ac1f8d80001e0002030602868386001b0f0bd00bf2de9f04141f2040843f6fc77cef20008c2f200070146d8f8004038680d6801466ff39601b1f1005f06d101684ef66162ccf2ff0291423fd044f6d341c0f247014ff409708847002846d00021002200bf831881540432b2f5097f59709970d970f6d14ef66161ccf2ff010160012180f8ce104ff0ff31a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe103860d0f8d81081b144f6d350c1f26200a1fb0001880901284ff0010088bf88094be000203860fa2047e044f6342245f6e466c2f20702cff6f8761368314617689f420ed117689f420bd117689f4208d117689f4203d1002901f10401efd19f422ad0d8f80030176800bf1168b9420ed11168b9420bd11168b94208d11168b94203d1002e06f10406efd1b94214d0d8f8001044f6d357ca1ac1f26207a2fb0776c0f8d820b00901284ff0010088bfb009994208bffa2000e0fa20611bb1fbf0f0bde8f08100bf2de9f04f85b043f6fc76c2f200063568804628466ff3960044f6d344b0f1005fc0f2470406d128684ef66161ccf2ff0188423bd04ff40970a0470546a8b30020002100bf6a1868540431b1f5097f50709070d070f6d14ef66160ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe003560b8f1000f18bf002d07d14af26950c0f2450005b0bde8f04f0047d8f80cb0bbf1000ff2d0d8f820a0baf1000fedd0a94659f8040f00287bd0686900287ad0686a002879d0686b002878d0686c002877d0686d002876d0686e002875d0686f002874d0d5f88400002872d0d5f89400002870d0d5f8a40000286ed0d5f8b40000286cd0d5f8b00029690490d5f8a0002a6b0390d5f8900000260290d5f880002f6f0190286ad5f860e0d5f850c02b6c884238bf014638bf01268a423cbf114602268b423cbf194603268c453cbf614604268e453cbf714605268f423cbf39460626019888423cbf01460726029888423cbf01460826039888423cbf014609260498884238bf0146d5f8c00038bf0a26884238bf0b2609eb0610406804f1440137018847002049f80700012085f8df0016e0002614e0012612e0022610e003260ee004260ce005260ae0062608e0072606e0082604e0092602e00a2600e00b265046a04700283ff451af0af0030c5fea9a034ff0000219d00496a2eb830e431c0bf101066ff0030700bff119cc78da19d4700c79043714714c79547189790eeb070404349171f0d1049e3a1dbcf1000f10d01bf80230bcf1010f83540ad0531c1bf80370bcf1020fc75403d0911c1bf80120425409eb06114860d5f8c400320149f80280421cc1f808a0c5f8c420c8600ce738464146fff7aebe2de9f04f81b043f6fc79c2f20009d9f80050044628466ff3960044f6d34816460f46b0f1005fc0f2470806d128684ef66161ccf2ff0188423dd04ff40970c0470546002800f09580002000216a1868540431b1f5097f50709070d070f6d14ef66160ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe00c9f8005005f1040b4ff0000a4ff0000900bf4ff0ff30002200234ff0ff3105e000bf6032c02a03f1060332d0af187e68a64204d13e6986423cbf194630467e69a64204d13e6a86423cbf591c30467e6aa64204d13e6b86423cbf991c30467e6ba64204d13e6c86423cbfd91c30467e6ca64204d13e6d86423cbf191d30467e6da642ced13f6e87423cbf591d3846c8e700bf002910d40beb01104768090182684bf801a02046394600f013f8814608f1440138468847ace7484601b0bde8f08f204639463246c9f8005001b0bde8f04fffe72de9f047a4b0804640f6bb4043f6fc77c0f24e0091468a46c2f2000780473c68002021466ff39601b1f1005f02908df80c0006d120684ef66161ccf2ff0188423ed044f6d341c0f247014ff4097088470446a0b300200021621860540431b1f5097f50709070d070f6d14ef66160ccf2ff002060012084f8ce004ff0ff30a4f8e000a4f8e200a4f8e400a4f8e600a4f8e800a4f8ea00a4f8ec00a4f8ee00a4f8f000a4f8f200a4f8f400a4f8f600a4f8f800a4f8fa00a4f8fc00a4f8fe003c60baf1000f4ff0010618bfb9f1000f20d101af3846fff714fc02ad404651464a460123009500f042fc05463846fff7b6fc002e064608d19df80c0028b943f61f00c0f247004c308047002c18bfc4f8d06022e09af8000008280ed9a0f18301052905d8012202fa01f111f0290f09d100f07f000928ccd104e00121814011f4a47febd03cb143f61f00c0f24700804794f81c0228b14ff0ff35284624b0bde8f0870026b5e743f6fc70c2f20000016808466ff39600b0f1005f16d108684ef66162ccf2ff0290420fd1d1f8fc0160b144f63422c2f207021268801a0028cebf01200020c1f8fc01704700207047f0b101684ef66162ccf2ff02914218bf704790f8061299b110b544f62f344ff0000cc0f24604864680f806c20120002100220023aef804c2a446bde810406047704700bf2de9f04143f6fc77c2f200073f684ff000083c466ff39604b4f1005f07d13e684ef66165ccf2ff05ae4208bfb84601280fd11c4615460f460646fff79bff2346044639462a463046002c18bfb8f1000f06d144f62f3cc0f2460cbde8f041604798f8060270b1d8f800020021002888f80612a8f804123ed049f2d941c0f24401884738e0b8f804020121013080b2012898bf0846a8f80402d8f8000249f2d944c0f2440488f8061268b94ff60370cff6ff70a4f594777844002142460023b847c8f8000240b1a047d8f80002a4f140024ff4c8719047c8b198f80602002808bfbde8f081d8f80002002188f80612a8f8041200b1a04744f62f3cc0f2460c0120002100220023bde8f04160474af26950c0f245008047012830d1082088f80702032088f80802102088f80902002088f80a02b22088f80b02062088f80c0288f80d024620b8f8041288f80e02432088f80f0201200f0a45f6153c08f2072288f8100288f8110288f81212c0f2470c09210d2388f81372bde8f0416047bde8f08170b50446d0f8000249f2b1360d46c0f2440668b94ff61d60cff6ff707844002122460023b0470028c4f8000208bf70bd06f594718847d4f8000206f1e8022946bde87040104700bf2de9f04f83b04768002f00f001828368002b00f0fd8143f6fc7e07eb03094ff0000cc2f2000e0026002410e04ff0000c0299ae46c5f800c030463a4608eb0b0300264b451f464ff0000480f0e181ba461af9013b03f07f05b540002b44ea050410d404f00703012b16dc0bb3012b40f0cf81a9eb0a03082bc0f0ca8107f10903dee700bfca4580f0c381182e06f107065746dcd9bce100bf022b3ad0052b40f0b781a9eb0a03042bc0f0b2817b1dc7e7ca4580f0ad8197f90130002b07f10203bed54b4580f0a48197f90230b3f1ff3f07f10303b4dc4b4580f09a8197f90330b3f1ff3f07f10403aadc4b4580f0908197f90430b3f1ff3f07f10503a0dc4b4580f0868197f90530002b00f18181bb1d96e7ca4580f07c8197f9013007f10208002b03f07f0b1fd5c84580f0718197f90260fb1c06f07f05b6f1ff3f4beac51b02ddc24698460fe04b4580f0618197f9036007f1040806f07f05b6f1ff3f4bea853b40f3ae809a46a9eb08039b4500f24f8124f00703b3f54a7f7ff45fafbbf1060ffff45baf98f80030462b7ff456af9af80230432b7ff451af9af80330012b7ff44cafdef8004023466ff39603b3f1005f06d123684ef66165ccf2ff05ab424fd0029144f6d34106464ff40970c0f2470175461746884700283ff427af02990446002330463a464ff0000cae4600bfe71804f803c00433b3f5097f87f801c087f802c087f803c0f2d14ef66163ccf2ff032360012384f8ce304ff0ff33a4f8e030a4f8e230a4f8e430a4f8e630a4f8e830a4f8ea30a4f8ec30a4f8ee30a4f8f030a4f8f230a4f8f430a4f8f630a4f8f830a4f8fa30a4f8fc30a4f8fe30cef800409af804309af805709af80660032b47ea062740dc012b49d0022b00f08480032b7ff4dbaecde901208a4665467646fff78cfd019a03460298b646ac465146002b3ff4cbae94f80632002b3ff4c6ae204641f28831a4f804726446fff77cfe5ce0c84580f0a48097f904607b1d06f07f05b6f1ff3f4bea455b3ff732af4b4580f0968097f90560002e00f1918007f106084bea067b36e7042b15d0052b6ad0062b04bfc4f820c284f81ec296e644f63423c2f207031b6845f69075c0f201052b44c4f8fc3189e6cde901208a4665467646fff73bfd019a03460298b646ac465146002b3ff47aae94f80632002b3ff475aeb4f80432bb427ff470aed4f8003284f806c2002ba4f804c23ff467ae49f2d9411846c0f2440164468847dde90120b646a446514659e694f80632c4f8fcc1002b3ff453ae0646d4f8000275468a46174684f806c2a4f804c220b149f2d941c0f24401884744f62f340120002100220023c0f24604a04730463a4651464ff0000cae4632e6d4f8203253b144f63425c2f207052f68db1b002bd8bf84f81ec201e084f81ec244f63423c2f207031b6845f69075c0f201052b44c4f8203215e640f22113c0f2490303b0bde8f04f18477fb50646002806d1fff7c0fc002807d19de80f00064641f6d67cc0f24e0c60477fbd00bf092960d12de9f047a22602eb030cd65406268cf8016041f28c78c0f200084ff0000ef84418f80e700ceb0e0508eb0e06ef707778b47896f8039096f804a02f716c7185f8069085f807a074790ef11e0e2c72b479bef13c0f6c72f479ac72347aec72747a2c73b47a6c73f47aac73347bec73747b2c74b47b6c74f47bac74347cec74747c2c75b47c6c75f47cac75347dec75747d2c76b47d6c76f47dac76347eec76747e2c77b47e6c77f47eac77347fec77747f85f82040b4d13b273e338cf80270bde8f04745f6153cc0f2470c60474df63040c2f234000078042818bf704780b582b04af26b1e4ff0000cc0f24d0e0020002100220923cdf804c0cdf800c0f04702b080bd00bff0b583b04df63043c2f234031b784ff6e704042bc0f2450420d144f2d043c2f207031b680546184616460f46a04703463946324628468bb11b68e02b0ed14af26b160027c0f24d060020002100220a2301970097b047012003b0f0bd04f1160303b0bde8f04018472de9f04f95b0002918bf002a04d115b0bde8f04f00f022bc0e78ddf878a006f07f05072d08dd082d00f09d80092d00f0e880422debd0e2e1052d00f06b81072d40f0dd8143f6fc74c2f20004206803466ff39603b3f1005f06d103684ef66167ccf2ff07bb4241d00e4644f6d341c0f247014ff4097015468847a0b300210022831881540432b2f5097f59709970d970f6d14ef66161ccf2ff010160012180f8ce104ff0ff31a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1031462a462060022a2cbf4978ff21002800f0a08302294ff0000500f0da82012900f0d382002940f096834ff0ff31c0f8dc50a0f8cc50c0f8c850a0f8e010a0f8e210a0f8e410a0f8e610a0f8e810a0f8ea10a0f8ec10a0f8ee10a0f8f010a0f8f210a0f8f410a0f8f610a0f8f810a0f8fa10a0f8fc10a0f8fe1080f800516ae3002b4ff0ff3500f066834af28973cff6fd73d71802339f42c0f05d8391f80190b9f1000f00f0dd8102274ff00108bc1c944200f2e782cb19cf5d5b7857ea032300f0e0821f19974200f2dc820e5d092e0bd9833e062e4ff0ff3500f23c8308fa06f616f0490f05d135e308fa06f515f4127feed015460e4621441a4600230446cdf800a0fff709ff002840f0bb82b9f1010931462a462046c9d1a2e137064ff0210658bf1126b242c0f0ac82002f01f101060ed54af26952c0f245020f4604461d4690472b4601462046022918bf07f11106317972794ff0ff3551ea022b1ebfb179f27951ea022900f0f582317b727b41ea02218b4540f0ee82b17bf27b41ea0221894540f0e7823178727841ea02210beb0102b2f5207f00f2dd82b278f47842ea042209eb0204b4f5f07f00f2d382347a777a44ea07280beb0807b7f5207f00f2c982b77af67a47ea062609eb0607b7f5f07f00f2bf828568002d00f05282b0f84070b0f842406743b7f5163fc0f049821c46074628464346cde901b9009600f0bdfbdaf800000f280bd80aebc0010130a1f806800e81a1f80ab0a1f80c90caf80000002c00f09582384619e143f6fc75c2f20005022a2cbf91f801804ff0ff082c6820466ff39600b0f1005f06d120684ef66163ccf2ff03984244d00f4644f6d341c0f247014ff4097016468847002800f0fa800446002000213246631860540431b1f5097f58709870d870f6d14ef66160ccf2ff002060012084f8ce004ff0ff303946a4f8e000a4f8e200a4f8e400a4f8e600a4f8e800a4f8ea00a4f8ec00a4f8ee00a4f8f000a4f8f200a4f8f400a4f8f600a4f8f800a4f8fa00a4f8fc00a4f8fe002c6094f8080178b1d4f8040148b149f29943c0f2440340330d461646984732462946002084f808010120032a80f0b180bde0ef1e18bf0127ac1f18bf0124032afff4ffad27407ff4fcad00274c1ca2f1010c8df81c708df81d708df820708df824708df825708df826708df827708df828708df829708df82a708df82b708df82c708df82d708df82e708df82f708df830708df831708df832708df833708df834708df835708df836708df837708df838708df839708df83a708df83b708df848708df849708df84a708df84b708df84c708df84d708df84e708df84f708df850708df851708df852708df85370cde9074c4df6bb04cff6ff747c440f944df6bf04cff6ff747c44032d1094119774d0062d40f044810646002000211d4600f0c5fcb168002900f03a81b6f84020b6f842005043b0f5163fc0f0318107a84ff4a0724ff4f07300f083fd002800f02781daf800000f280dd80aebc0010022ca800a814ff420724a814ff4f07201308a81caf80000002d304600f07981514600f001fa74e100202860002439463246032a0dd3b8f1000f0ad18878082800f2678142f6c521c0f25001963188475fe1052a19d3b8f1010f16d188780025421e062a00f25681cb78032b00f252810a79002a00f04e8142f6c521c0f2500101f59a771946b84743e1b8f1020f40f0828042f6c520c0f25000804739e1370600f1ae80082ac0f0cc804ff0070e4ff0050c01240e1996f802904ff0ff35b9f1000f00f02781f778002f00f0238111f804804fea890b0beb8804b4f5207f00f2198174787e0006eb4407b7f5f07f00f21181069001eb0c000d4611f80c104078774641ea002081b20120cde9043200f01ffc002840f0fd8006998868002800f09080b1f84020b1f842105143b1f5163fc0f08780e919079105994fea4902c91b089104eb840100ebc11000eb480107a8334600f0cffc002873d0daf8001004980f290cd84fea880263000aebc1070131fa803b81a7f80ab0be81caf80010002806987ff44dafc4e0012180f8ce10c1e080f8ce50bee0072a56d3b8f1030f53d18878cb780a7940ea03204d798e7901284ff0010498bf204644f62061884228bf084642f6c521c0f25001642a28bf642201f5e2731146984744f20450c2f207000068002800f0958045ea062149f29942012988bf0c46c0f244022146904788e00c2a1ed3cf78ce79b7421ad10f790e7ab74216d14af26954c0f245040d46164680461f46a0473b46324629460646404605244ff00b0e4ff0090c022e08bf012438e74ff0ff3565e0032a4ff0000561d3a8f10403b3fa83f35b0918405ad0d01e4cf6cd42ccf6cc428b78a0fb0202b3eb920f88bf9308302b184628bf3020002b4cd000eb800303f0030c03f4fe770023ce18f578e21882f80a513579043382f80b5175799f4282f80c51b67982f80d61eed1bcf1000f10d01944ca782344bcf1010f83f80a2108d00a79bcf1020f83f80b211cbf497983f80c1184f80801d4f8040149f29946c0f24406002184f8091168b94df27750cff6ff70a6f1e8077844224600230025b847c4f8040148b10121b0470025284615b0bde8f08fa4f80851f8e742f6c520c0f2500084f808518047f0e700bff0b583b043f6fc73c2f200031f683b466ff39603b3f1005f09d13b684ef66166ccf2ff06b34204bf002387f81e32002958d0362a56d30b78422b53d14b784d2b50d10b7f4f7f43ea0723042b4ad18b7dcf7d0e7e43ea072343ea06434f7e8e7ccd7c53ea076346ea05270e7d4d7d47ea064747ea05641d4648bf5d42b0f84070002b4ff00003c8bf0123bc422ad1b0f84270bd4226d18f7ace7a91f80cc047ea06274e7b47ea0c4747ea0667974219d2621c032606eb5202866822f0030cca19cde901c30746304621462346009500f0bffd3846314622462b4600f053fe002003b0f0bd4cf2af53c0f24d0303b0bde8f04018472de9f04182b043f6fc77c2f200073d680c4629466ff39601b1f1005f064606d128684ef66161ccf2ff0188423ed044f6d341c0f247014ff4097088470546a0b3002000216a1868540431b1f5097f50709070d070f6d14ef66160ccf2ff002860012085f8ce004ff0ff30a5f8e000a5f8e200a5f8e400a5f8e600a5f8e800a5f8ea00a5f8ec00a5f8ee00a5f8f000a5f8f200a5f8f400a5f8f600a5f8f800a5f8fa00a5f8fc00a5f8fe003d60b068002818bf002d02d102b0bde8f081b6f84010b6f842205143b1f5163ff4d3c5f818024ff001084ff4f07085f81c8201904ff4207044f267060090c0f2470600200021002200230027b04730b185f81c72c5f8187202b0bde8f08184f8048002b0bde8f08100bf2de9f04f8ab0dde914a5089243ea010242ea0a02d207864640f0c4800eeb51004ff0ff374fea5a0c0eeb53068646012207eb5a00bcf1010f88bf4fea5a02069002f003000790caf341006ff00107059007eb5a006ff00207019007eb5a00009022f00302701c544203900ef101004ff0000b09960290cdf810e004e00bf1010bab4500f0c3810898139e5f466fea0b02864288bfaf183a183744099802eb820207eb87070eeb82198b4200eb871835d9059e6246b6b10698012e19f8002008f8002002460ed00198022e19f8002008f80020024606d0009819f8002008f80020024600bf06980328c8d300bf09eb020717f8016c08eb020000f8016c17f8026c043a00f8026c17f8036c00f8036c17f8047c00f8047ce9d1b0e700bfbaf1080f02d2002223e000bf03989601ba0102440298e64600eb060a6ff0030c0aeb0c00c67802eb0c07fe7006790cf1040c3e7146797e71807904eb0c060436b871edd10cf10402dde914a5f446ddf810e0079800283ff483af079e19f80200012e08f802003ff47baf501c079e19f80070022e08f800703ff472af901c19f8002008f800206be74ff6fc7000ea0a000af0030b0990aaf1010000240490cde905be07e0079c159d0134ddf850a0ac4200f01e81089f139ee0432246be42079488bf2a18d01900eb80000eeb801c901900eb8000baf1040f0eeb80184ff00009c0f09880ddf810a0ddf850e048468b4288bf504600eb010400eb03054fea54001cf800706ff0010080ea090009f1010288bf0eeb00026ff0020089ea000609f1020088bf0eeb06006ff0030686ea090609f1030b4feac47488bf0eeb060b07f00f06002c4fea550408bf3e0918f80470ed0707f00f0507f0f007374408bf45ea061708f80470541865081cf805501a44e40705f00f064fea520408bf2e0918f80450d20705f00f0205f0f005354408bf42ea0615421808f8045054081cf804401844d20704f00f054fea500208bf250918f80240c00704f00f0004f0f0042c4408bf40ea05140beb010008f8024042081cf802200beb0304c00702f00f054fea540008bf150918f80020e40702f00f0402f0f0022a4408bf44ea051208f80020099809f104098145aaf1040a7ff46eafdde905bebbf1000f3ff444af6fea09004a468b42149f88bf3a18501845081a44c0071cf805504fea520018f8007005f00f0408bf2c0907f00f0507f0f0072744d20708bf45ea0417bbf1010f08f800703ff420af149809f10102a0eb090a8b4288bfaaf10202541865081a44e4071cf805504fea520418f8040005f00f0708bf2f0900f00f0500f0f0003844d20708bf45ea0710bbf1020f08f804003ff4faae09f102008b4288bfaaf10300421854081844d2071cf804704fea500218f8024007f00f0508bf3d0904f00f0704f0f0042c44c00708bf47ea051408f80240d9e60ab0bde8f08f00bf70b543f6fc76c2f2000632680c4611466ff39601b1f1005f054606d110684ef66161ccf2ff01884240d044f6d341c0f247014ff409708847002800f08180024600200021531850540431b1f5097f58709870d870f6d14ef66160ccf2ff001060012082f8ce004ff0ff30a2f8e000a2f8e200a2f8e400a2f8e600a2f8e800a2f8ea00a2f8ec00a2f8ee00a2f8f000a2f8f200a2f8f400a2f8f600a2f8f800a2f8fa00a2f8fc00a2f8fe0032600120002d82f8cc0047d0104630f8e01fa1423bd0b2f8e210a14237d0b2f8e410a14233d0b2f8e610a1422fd0b2f8e810a1422bd0b2f8ea10a14227d0b2f8ec10a14223d0b2f8ee10a1421fd0b2f8f010a1421bd0b2f8f210a14217d0b2f8f410a14213d0b2f8f610a1420fd0b2f8f810a1420bd0b2f8fa10a14207d0b2f8fc10a14203d0b2f8fe10a1420ad1012082f8de0070bd0020306070bd82f8cd00002070bd92f8cd1081b9b2f8c810611a0bb2b3f1ff3f06dd89b2022924bf012182f8dd1002e0012182f8dc10b2f8ca30002182f8cd109c42a2f8c84088bfa2f8ca4092f8001120f81140481c00f00f0082f80001002070bd00bf2de9f04fcdb04ef687249246c0f25b044df2546298460e4604f13c07c0f278020f2138230546b84718b12846a047002423e20afb08f040000b960295059001250da94ff4807004f585724ff0000b4ff0000947464ff000080023564604930a930697cdf820a00192029ce1602061204600219047e1680daa891a07910da900f0e681ddf82ce00021002400900be000bf04940c9c002101234ff0030807980134844200f0d181002940f0e0810da80c94045db8f1020febd0b8f1010f00f09280b8f1000f40f0968004f00f000a900598210900f0a6808842c0f08880401a05900a9800eb00140001039014e01cf80b000a9a00f0f00010440cf80b000bf1010b01390125b34524bf4ff0000b09f10109002900f08c81b9454ff000084ff0000338bf012380f0028109eb8900002d0eeb801cdbd0cdf82490a946a6eb0b05b5eb510f88bf4d088db3a8080ceb0b0820d0002708f10102a7eb80006ff0030600bf02eb060e043600eb060a1af104078ef803408ef804408ef805408ef80640efd1301d069f089eddf82ce015f0030204d10ce0002015f0030208d0012a08f8004004d04044022a447018bf8470a1eb4501ab4489b1b34510d21cf80b00039a00f00f001043ddf824900cf80b00013900250029a0d12be100bf00214d46ddf8249090e700bfbcb10598a04228d201214ff0000821e0ddf810a005985aea042a16d00c9c5045cdf810a080f0938001214ff00008002342e70c9c002101234ff002083ce70c9c00214ff00108012336e7002001214ff0000804900c9c00232ee7001b05900a9800eb00110001099015e000bf1af80b200a9802f0f00202430af80b200bf1010b013c0125b34524bf4ff0000b09f10109002c00f0da80b9454ff000084ff0000338bf012350d209eb8902002d0eeb821adcd0ac46a6eb0b05b5eb540f88bf650855b3ae080aeb0b0818d0002008f10102a0eb860e6ff00306901904360eeb06070437c170017141718171f5d1069fddf82ce0321d15f0030604d10de0002215f0030609d0012e08f8021005d04244022e517018bf917000bfa4eb4504ab447cb1089eb3450ed21af80b00099a00f00f0010430af80b00013c0025002cabd184e0089e002465469de70c9c0121b4e6a0eb0a0005900a9800eb00110001099015e01cf80b000a9a00f0f00010430cf80b000bf1010baaf1010a0125b34524bf4ff0000b09f10109baf1000f65d0b9454ff000084ff0000338bf01235bd20b9a09eb8900002d02eb801cdad0ce46a946a6eb0b05b5eb5a0f88bf4fea5a0545b3a8080ceb0b0817d0002408f10102a4eb80006ff003069719043684190434f97039717971b971f6d1301d069f089e0c9c15f0030204d10ce0002015f0030208d0012a08f8001004d04044022a417018bf8170aaeb450abaf1000fab4411d0b34511d21cf80b00099a00f00f0010430cf80b00aaf1010a0025f146baf1000fa6d10be04ff0000a4d46f14697e70c9c4ff00008002131e6012102e04ff000080021ddf82ce029e600980da973b1012817d04ff0000450b90798019ab0fa80f040094ff480703ff4ffad00e0002402984ef68721c0f25b01884720464db0bde8f08f059840ea0800b0fa80f04409eee72de9f04f83b00c9e0292002e019000f08e80019823f00304471c029803f0030ac4f1000c01384ff00008009005e000bf08f10108b0450f4479d00e98c14600286fea080418bf06eb0409002bf0d0042b06d24ff0000bbaf1000f2ed1e8e700bf0d98b64609fb00f400986ff003050444607800f0f00242ea10107a19d0706078043500f00f0646ea0010107114f8020f00f0f00646ea10105071207800f00f0646ea00100ceb050604369071e0d105f1040b7646baf1000fbad002980d9a4fea5b0509fb0204019814f805e008fb01050ef00f025feacb7908bf4fea1e1242ea0212baf1010f05f80b20a1d00bf1010e4fea5e00205cb9f1000f4fea101208bf00f00f0242ea0210baf1020f05f80e008ed00bf102004208a25cb9f1000f02f00f0408bf140944ea04122a5480e703b0bde8f08f2de9f04182b003fb02f68846cde9001645f20f1107466846c0f247011c461546884740f2196047f8240f788948f2816245ea0040b86045ea044057f8204c7860c0f2490220463946fe60c7f81080904740f25761c0f244012046884702b0bde8f0814556454e4346572f3620696d6735373620696d6736343020696d677a20726c652077616b656c6561736520646972656374666220666267756172640000000000000000000000000000002020202020002020000000505050000000000000000000005050f85050f85050000000002070a8a07028a8702000000048a85010202854480000000020505020689090680000002020200000000000000000000010204040404020100000000040201010101020400000000000005020f82050000000000000002020f82020000000000000000000000020204000000000000000f800000000000000000000000000202000000000080810102020404000000000708898a8c88888700000000020602020202020700000000070888808102040f8000000007088083008088870000000000818284888f8080800000000f88080f00808887000000000708080f08888887000000000f808081010202020000000007088887088888870000000007088888878080870000000000000202000002020000000000000202000002020400000000008102040201008000000000000f80000f8000000000000004020100810204000000000708888102000202000000000708898a8a89880780000000070888888f888888800000000f08888f0888888f000000000708880808080887000000000e0908888888890e000000000f88080f0808080f800000000f88080f0808080800000000070888080b888887000000000888888f888888888000000007020202020202070000000003810101010909060000000008890a0c0c0a090880000000080808080808080f80000000088d8a8a888888888000000008888c8a89888888800000000708888888888887000000000f0888888f080808000000000708888888888a87008000000f0888888f0a0908800000000708880700808887000000000f8202020202020200000000088888888888888700000000088888850505020200000000088888888a8a8d88800000000888850202050888800000000888850502020202000000000f8081020408080f8000000007040404040404070000000004040202010100808000000007010101010101070000000205088000000000000000000000000000000000000f80040200000000000000000000000000000700878888878000000008080f088888888f00000000000007088808088700000000008087888888888780000000000007088f8808078000000001820702020202020000000000000788888888878087000008080f08888888888000000202000602020202070000000080800180808080808483000004040485060605048000000006020202020202070000000000000f0a8a8a8a8a8000000000000f08888888888000000000000708888888870000000000000f088888888f0808000000000788888888878080800000000b8c0808080800000000000007880700808f00000000020207020202020180000000000008888888888780000000000008888505020200000000000008888a8a8a870000000000000885020205088000000000000888888888878087000000000f810204080f800000000182020402020201800000000202020202020202000000000601010081010106000000048a8900000000000000000", "desc": "append injected blobs to main-app payload" }, { "offset": 777711, "old": "44c33500", - "new": "5e013600", + "new": "b2003600", "desc": "main-app subheader payload size (ps)" }, { "offset": 152, "old": "c4c33500", - "new": "de013600", + "new": "32013600", "desc": "main-app TOC entry size (ps + 128)" }, { "offset": 777831, "old": "44c33504", - "new": "5e013604", + "new": "b2003604", "desc": "main-app preamble length (low 24 bits)" }, { "offset": 777835, "old": "df8110c9", - "new": "5e1ef1ea", + "new": "20ac3023", "desc": "[5] ota/s200_firmware_ota.bin preamble crc32" }, { "offset": 156, "old": "c1be0fb1", - "new": "3f9497ba", + "new": "2668f4d0", "desc": "[5] ota/s200_firmware_ota.bin component crc32c (TOC)" }, { "offset": 777715, "old": "c1be0fb1", - "new": "3f9497ba", + "new": "2668f4d0", "desc": "[5] ota/s200_firmware_ota.bin component crc32c (subheader)" } ] diff --git a/app/graphics/image.ts b/app/graphics/image.ts index 77670b8a..f234f4be 100644 --- a/app/graphics/image.ts +++ b/app/graphics/image.ts @@ -1,8 +1,8 @@ import { BdfFont, Glyph } from "./bdffont"; import { wrapText } from "./textwrap"; -export const G2_LENS_WIDTH = 580; -export const G2_LENS_HEIGHT = 300; +export const G2_LENS_WIDTH = 640; +export const G2_LENS_HEIGHT = 480; const DEFAULT_CORNER_RADIUS = 8; export function imageFromAsciiArt(lines: readonly string[], value = 255): GrayImage { diff --git a/app/prompts.ts b/app/prompts.ts index dbb7f03c..9d2ae343 100644 --- a/app/prompts.ts +++ b/app/prompts.ts @@ -8,7 +8,7 @@ import type { AssistantContext } from "./assistant/types"; /** Base system prompt for the on-glasses voice assistant. */ export const ASSISTANT_SYSTEM_PROMPT_BASE = [ "You are the voice assistant built into a pair of Even Realities G2 smart glasses.", - "Your reply is shown as text on a 580x300 monochrome heads-up display and may also be read aloud, so keep it short: 1-3 plain sentences, no markdown, no bullet lists unless the user explicitly asks for a list.", + "Your reply is shown as text on a 640x480 monochrome heads-up display and may also be read aloud, so keep it short: 1-3 plain sentences, no markdown, no bullet lists unless the user explicitly asks for a list.", "Prefer doing things with the tools you have over describing how the user could do them; when a tool can answer or act, use it.", "If a tool fails or a capability is missing, say so briefly rather than inventing a result.", ].join(" "); diff --git a/app/ui/menu.ts b/app/ui/menu.ts index e44c1eee..db09e3e8 100644 --- a/app/ui/menu.ts +++ b/app/ui/menu.ts @@ -332,13 +332,15 @@ export class TextPageLayer implements Layer { const font = getDefaultSmallFont(); const image = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0); image.drawText(font, 18, 14, this.title, 220); - image.drawRect(12, 12, 552, 264, 52); + image.drawRect(12, 12, G2_LENS_WIDTH - 24, G2_LENS_HEIGHT - 24, 52); - const wrapped = wrapText(font, this.body, 520); - for (let index = 0; index < wrapped.length; index++) { + const wrapped = wrapText(font, this.body, G2_LENS_WIDTH - 60); + const footerY = G2_LENS_HEIGHT - 48; + const maxBodyLines = Math.max(0, Math.floor((footerY - 50) / 14)); + for (let index = 0; index < Math.min(wrapped.length, maxBodyLines); index++) { image.drawText(font, 24, 42 + index * 14, wrapped[index]!, 190); } - image.drawText(font, 24, 252, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, 24, footerY, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; }