A truly modular keyboard
C
firmware: leave a backwards Keybit's lines alone
Nathan9064846feecb
diff --git a/app/PROTOCOL.md b/app/PROTOCOL.mdindex e0ba5f4..b6a9985 100644--- a/app/PROTOCOL.md+++ b/app/PROTOCOL.md@@ -63,6 +63,8 @@ Keybits relayed through other Keybits are reported as `KEY+ uid=<uid> at=X via=<| `KEY+ uid=<uid> at=<L\|R\|T>` | a Keybit is attached || `KEY- uid=<uid>` | a Keybit is removed || `PRESS uid=<uid> down=<0\|1>` | a Keybit is pressed or released |+| `ERR bus SDA held low, ...` | SDA has been held low for 100 ms: usually a Keybit on the Keyword turned the wrong way round. The Keyword stops polling until it clears (one retry a second) and blinks red |+| `OK BUS clear` | the bus is free again after that |## Optional features (v1 extensions)diff --git a/firmware/Core/Inc/keybit_bus.h b/firmware/Core/Inc/keybit_bus.hindex 4cf79fd..e235e31 100644--- a/firmware/Core/Inc/keybit_bus.h+++ b/firmware/Core/Inc/keybit_bus.h@@ -34,6 +34,16 @@ typedef struct {uint32_t last_seen; /* HAL_GetTick() */} keybit_remote_t;+/* SDA low with SCL high while we aren't using the bus. A Keybit turned the+ * wrong way round on the keyword does this: its GND lands on our SDA and+ * its 3V3 on our SCL, so every SCL low we drive pulls its supply down+ * through its SCL clamp diode. keybit_bus_held() reports the state;+ * keybit_bus_jammed() is the same but lets one attempt through about once+ * a second, so a Keybit stuck mid-byte still gets clocked free. Check+ * keybit_bus_jammed() before starting any transfer. */+int keybit_bus_held(void);+int keybit_bus_jammed(void);+/* Give every Keybit still on the default address its own address. Returns* how many were assigned. */int keybit_bus_assign(I2C_HandleTypeDef *i2c);diff --git a/firmware/Core/Src/keybit_bus.c b/firmware/Core/Src/keybit_bus.cindex dabe31b..f171434 100644--- a/firmware/Core/Src/keybit_bus.c+++ b/firmware/Core/Src/keybit_bus.c@@ -18,6 +18,32 @@#define EV_PRESSED 0x01#define MAGIC 0x4B+/* I2C3's pins (see stm32wbxx_hal_msp.c); IDR still reads them in AF mode. */+#define BUS_PORT GPIOB+#define BUS_SCL GPIO_PIN_13+#define BUS_SDA GPIO_PIN_14+#define JAM_RETRY_MS 1000++int keybit_bus_held(void)+{+ return HAL_GPIO_ReadPin(BUS_PORT, BUS_SDA) == GPIO_PIN_RESET &&+ HAL_GPIO_ReadPin(BUS_PORT, BUS_SCL) == GPIO_PIN_SET;+}++int keybit_bus_jammed(void)+{+ static uint32_t last_try;+ if (!keybit_bus_held()) return 0;+ /* Let one attempt through now and then: its few clocks free a Keybit+ * that really did get stuck mid-byte, at a tiny fraction of the usual+ * poll rate. */+ if (HAL_GetTick() - last_try >= JAM_RETRY_MS) {+ last_try = HAL_GetTick();+ return 0;+ }+ return 1;+}+static int is_ready(I2C_HandleTypeDef *i2c, uint8_t addr){return HAL_I2C_IsDeviceReady(i2c, (uint16_t)(addr << 1), 1, I2C_TIMEOUT_MS) == HAL_OK;@@ -179,11 +205,13 @@ int keybit_bus_poll_relay(I2C_HandleTypeDef *i2c, const keybit_info_t *k, int n,int keybit_bus_read(I2C_HandleTypeDef *i2c, uint8_t addr7, uint8_t reg, uint8_t *buf, uint8_t len){+ if (keybit_bus_jammed()) return 0;return read_regs(i2c, addr7, reg, buf, len);}int keybit_bus_write(I2C_HandleTypeDef *i2c, uint8_t addr7, uint8_t reg, const uint8_t *buf, uint8_t len){+ if (keybit_bus_jammed()) return 0;return HAL_I2C_Mem_Write(i2c, (uint16_t)(addr7 << 1), reg, I2C_MEMADD_SIZE_8BIT,(uint8_t *)buf, len, I2C_TIMEOUT_MS) == HAL_OK;}diff --git a/firmware/Core/Src/keybit_image.c b/firmware/Core/Src/keybit_image.cindex a09718c..9fac202 100644--- a/firmware/Core/Src/keybit_image.c+++ b/firmware/Core/Src/keybit_image.c@@ -1,8 +1,8 @@/* Generated from firmware/keybit by `make image` there. Do not edit. */#include "keybit_image.h"-const uint32_t keybit_image_len = 6224;-const uint8_t keybit_image_version = 4;+const uint32_t keybit_image_len = 6204;+const uint8_t keybit_image_version = 5;const uint8_t keybit_image[] __attribute__((aligned(4))) = {0x6f, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x62, 0x0a, 0x00, 0x00, 0x60, 0x0a, 0x00, 0x00,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,@@ -60,12 +60,12 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0xc1, 0x33, 0x03, 0xc7, 0xe1, 0xc2, 0x93, 0x87, 0xc1, 0xc4, 0x22, 0x97, 0x7d, 0x8b, 0x93, 0x16,0x27, 0x00, 0xba, 0x96, 0x91, 0x45, 0xb6, 0x97, 0x63, 0x0a, 0xb5, 0x00, 0x3e, 0x95, 0x03, 0x45,0x05, 0x00, 0xa2, 0x40, 0x12, 0x44, 0x82, 0x44, 0x31, 0x01, 0x82, 0x80, 0x03, 0xc5, 0x47, 0x00,- 0xcd, 0xbf, 0xa1, 0x47, 0x63, 0xec, 0xa7, 0x00, 0x89, 0x67, 0x93, 0x87, 0xc7, 0x80, 0x0a, 0x05,+ 0xcd, 0xbf, 0xa1, 0x47, 0x63, 0xec, 0xa7, 0x00, 0x85, 0x67, 0x93, 0x87, 0x87, 0x7f, 0x0a, 0x05,0x3e, 0x95, 0x1c, 0x41, 0x82, 0x87, 0x13, 0x05, 0xb0, 0x04, 0xe1, 0xbf, 0x13, 0x07, 0x10, 0x05,0x63, 0x04, 0xe5, 0x02, 0x13, 0x07, 0x20, 0x05, 0x63, 0x03, 0xe5, 0x02, 0x13, 0x05, 0xf0, 0x0f,0xc9, 0xb7, 0x03, 0xc5, 0xd1, 0xc2, 0x13, 0x75, 0xf5, 0x0f, 0x65, 0xbf, 0x03, 0xc5, 0x25, 0x00,0x4d, 0xbf, 0x03, 0xc5, 0xc1, 0xc2, 0x75, 0xb7, 0x03, 0xc5, 0x21, 0xc2, 0x5d, 0xb7, 0x03, 0xc7,- 0xf1, 0xc2, 0x13, 0x75, 0xf7, 0x0f, 0xe3, 0xfe, 0xe7, 0xf8, 0x21, 0x45, 0x59, 0xbf, 0x11, 0x45,+ 0xf1, 0xc2, 0x13, 0x75, 0xf7, 0x0f, 0xe3, 0xfe, 0xe7, 0xf8, 0x21, 0x45, 0x59, 0xbf, 0x15, 0x45,0x49, 0xbf, 0x03, 0xc7, 0xc1, 0xc2, 0x19, 0xc7, 0x63, 0x16, 0xa7, 0x00, 0x23, 0x86, 0x01, 0xc2,0x23, 0x90, 0x01, 0xc2, 0x82, 0x80, 0x93, 0x17, 0x25, 0x00, 0xaa, 0x97, 0x13, 0x85, 0x41, 0xc0,0x3e, 0x95, 0x03, 0x47, 0x05, 0x00, 0xb7, 0x16, 0x01, 0x40, 0x93, 0x86, 0x06, 0x80, 0x93, 0x57,@@ -167,7 +167,7 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0x73, 0x10, 0x05, 0x30, 0x97, 0xf6, 0xff, 0xff, 0x93, 0x86, 0xc6, 0x5f, 0x93, 0xe6, 0x36, 0x00,0x73, 0x90, 0x56, 0x30, 0x13, 0x85, 0x41, 0xc2, 0x93, 0x85, 0xc1, 0xda, 0x01, 0x46, 0x63, 0x56,0xb5, 0x00, 0x10, 0xc1, 0x11, 0x05, 0xe3, 0x4e, 0xb5, 0xfe, 0x17, 0x15, 0x00, 0x00, 0x13, 0x05,- 0x65, 0xe0, 0x93, 0x85, 0x41, 0xc0, 0x13, 0x86, 0x41, 0xc2, 0x63, 0x88, 0xc5, 0x00, 0x14, 0x41,+ 0x25, 0xdf, 0x93, 0x85, 0x41, 0xc0, 0x13, 0x86, 0x41, 0xc2, 0x63, 0x88, 0xc5, 0x00, 0x14, 0x41,0x94, 0xc1, 0x11, 0x05, 0x91, 0x05, 0xe3, 0x9a, 0xc5, 0xfe, 0xb7, 0xf7, 0x00, 0xe0, 0x05, 0x47,0x98, 0xc3, 0x85, 0x67, 0x93, 0x87, 0x27, 0xb8, 0x73, 0x90, 0x17, 0x34, 0x73, 0x00, 0x20, 0x30,0x01, 0xa0, 0x37, 0x17, 0x02, 0x40, 0x1c, 0x47, 0xb7, 0x06, 0x80, 0x00, 0xd5, 0x8f, 0x1c, 0xc7,@@ -188,7 +188,7 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0x17, 0x08, 0x98, 0xc3, 0x37, 0x07, 0x9f, 0x00, 0x98, 0xc7, 0x37, 0x17, 0x02, 0x40, 0x1c, 0x43,0x93, 0x96, 0x67, 0x00, 0xe3, 0xdd, 0x06, 0xfe, 0x5c, 0x43, 0xb7, 0x16, 0x02, 0x40, 0xf1, 0x9b,0x93, 0xe7, 0x27, 0x00, 0x5c, 0xc3, 0x21, 0x47, 0xdc, 0x42, 0xb1, 0x8b, 0xe3, 0x9e, 0xe7, 0xfe,- 0x82, 0x80, 0x13, 0x01, 0x41, 0xf2, 0x86, 0xcd, 0xa2, 0xcb, 0xa6, 0xc9, 0x02, 0xc0, 0x02, 0xd4,+ 0x82, 0x80, 0x13, 0x01, 0x41, 0xf2, 0x86, 0xcd, 0xa2, 0xcb, 0xa6, 0xc9, 0x02, 0xd4, 0x02, 0xc2,0x6d, 0x37, 0x37, 0x17, 0x02, 0x40, 0x1c, 0x4f, 0x93, 0xe7, 0x57, 0x03, 0x1c, 0xcf, 0xb7, 0xf7,0xff, 0x1f, 0x93, 0x87, 0x07, 0x7e, 0x8c, 0x47, 0xd0, 0x47, 0x98, 0x4b, 0x93, 0x87, 0x01, 0xc4,0x23, 0xa0, 0xb1, 0xc4, 0xd0, 0xc3, 0x98, 0xc7, 0xb7, 0x47, 0x00, 0x08, 0x03, 0xd6, 0x07, 0xfc,@@ -211,12 +211,12 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0xc3, 0x00, 0xd1, 0x8e, 0x14, 0xc3, 0x23, 0x8f, 0x67, 0xfe, 0xa3, 0x8f, 0x67, 0xfe, 0xe3, 0x91,0x87, 0xfa, 0xb7, 0xf7, 0x00, 0xe0, 0x9c, 0x47, 0xbe, 0xca, 0x85, 0x47, 0x3e, 0xd2, 0x92, 0x57,0x89, 0xcf, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0xd6, 0x47, 0x1d, 0x8f, 0xb7, 0xf7, 0x36, 0x00,- 0x93, 0x87, 0x07, 0xe8, 0xb3, 0x37, 0xf7, 0x00, 0x3e, 0xd2, 0x82, 0x57, 0x02, 0xc2, 0x3e, 0xcc,- 0x93, 0x87, 0x41, 0xc0, 0x3e, 0xc4, 0x93, 0x84, 0xc1, 0xce, 0x12, 0x45, 0xef, 0xf0, 0x2f, 0xc8,+ 0x93, 0x87, 0x07, 0xe8, 0xb3, 0x37, 0xf7, 0x00, 0x3e, 0xd2, 0x82, 0x57, 0x02, 0xc0, 0x3e, 0xcc,+ 0x93, 0x87, 0x41, 0xc0, 0x3e, 0xc4, 0x93, 0x84, 0xc1, 0xce, 0x02, 0x45, 0xef, 0xf0, 0x2f, 0xc8,0x19, 0xe1, 0x22, 0x45, 0xad, 0x34, 0xa2, 0x47, 0x37, 0x16, 0x01, 0x40, 0x13, 0x06, 0x06, 0x80,0x03, 0xc4, 0x17, 0x00, 0x13, 0x57, 0x44, 0x00, 0x2a, 0x07, 0x32, 0x97, 0x1c, 0x47, 0x3d, 0x88,- 0xb3, 0xd7, 0x87, 0x00, 0x85, 0x8b, 0x63, 0x8d, 0x07, 0x28, 0x23, 0x80, 0x04, 0x02, 0x92, 0x47,- 0x93, 0x84, 0x04, 0x03, 0x85, 0x07, 0x3e, 0xc2, 0xa2, 0x47, 0x12, 0x47, 0x95, 0x07, 0x3e, 0xc4,+ 0xb3, 0xd7, 0x87, 0x00, 0x85, 0x8b, 0x63, 0x8d, 0x07, 0x28, 0x23, 0x80, 0x04, 0x02, 0x82, 0x47,+ 0x93, 0x84, 0x04, 0x03, 0x85, 0x07, 0x3e, 0xc0, 0xa2, 0x47, 0x02, 0x47, 0x95, 0x07, 0x3e, 0xc4,0x91, 0x47, 0xe3, 0x1c, 0xf7, 0xfa, 0xb7, 0x17, 0x01, 0x40, 0x93, 0x87, 0x07, 0x40, 0x94, 0x47,0x83, 0x97, 0x61, 0xc2, 0x93, 0xf6, 0x06, 0x04, 0x63, 0x96, 0x06, 0x5c, 0x93, 0x06, 0x70, 0x0c,0x63, 0xc5, 0xf6, 0x00, 0x85, 0x07, 0x23, 0x93, 0xf1, 0xc2, 0x83, 0xc6, 0xd1, 0xc2, 0x03, 0x97,@@ -227,13 +227,13 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0xf6, 0xe7, 0xfd, 0x53, 0x83, 0xc5, 0x06, 0x00, 0x63, 0x8c, 0x65, 0x00, 0x03, 0xa7, 0x82, 0x00,0x83, 0xa0, 0x46, 0x00, 0x33, 0x07, 0x17, 0x40, 0x63, 0x77, 0xe6, 0x56, 0x23, 0x80, 0x76, 0x00,0x93, 0x86, 0x06, 0x03, 0xe3, 0x10, 0xd5, 0xfe, 0x13, 0x07, 0xd0, 0x0f, 0x63, 0x74, 0xf7, 0x56,- 0xfd, 0x57, 0x23, 0x81, 0xf1, 0xc2, 0x83, 0xc7, 0xf1, 0xc2, 0x7d, 0x57, 0x3a, 0xc2, 0x85, 0xcf,+ 0xfd, 0x57, 0x23, 0x81, 0xf1, 0xc2, 0x83, 0xc7, 0xf1, 0xc2, 0x7d, 0x57, 0x3a, 0xc0, 0x85, 0xcf,0x93, 0x04, 0xf0, 0x0f, 0x01, 0x44, 0x22, 0x85, 0xef, 0xf0, 0x6f, 0xb8, 0x0d, 0xc1, 0x22, 0x85,0xef, 0xf0, 0xcf, 0xb3, 0x09, 0xed, 0x82, 0x57, 0x13, 0x17, 0x14, 0x00, 0x22, 0x97, 0x12, 0x07,- 0x3e, 0x97, 0x03, 0x47, 0x07, 0x00, 0x63, 0x74, 0x97, 0x00, 0xba, 0x84, 0x22, 0xc2, 0x05, 0x04,+ 0x3e, 0x97, 0x03, 0x47, 0x07, 0x00, 0x63, 0x74, 0x97, 0x00, 0xba, 0x84, 0x22, 0xc0, 0x05, 0x04,0x11, 0x47, 0xe3, 0x1a, 0xe4, 0xfc, 0x37, 0x16, 0x01, 0x40, 0x13, 0x87, 0x41, 0xc0, 0x81, 0x46,- 0x13, 0x06, 0x06, 0x80, 0x05, 0x45, 0x91, 0x45, 0xe2, 0x47, 0x12, 0x44, 0x83, 0xc7, 0x87, 0x02,- 0xe3, 0x99, 0x86, 0x10, 0xb1, 0xe3, 0x83, 0x42, 0x17, 0x00, 0x37, 0x13, 0x01, 0x40, 0x13, 0x03,+ 0x13, 0x06, 0x06, 0x80, 0x05, 0x45, 0x91, 0x45, 0xe2, 0x47, 0x02, 0x44, 0x83, 0xc7, 0x87, 0x02,+ 0xe3, 0x9f, 0x86, 0x0e, 0xb1, 0xe3, 0x83, 0x42, 0x17, 0x00, 0x37, 0x13, 0x01, 0x40, 0x13, 0x03,0x03, 0x80, 0x93, 0xd7, 0x42, 0x00, 0xaa, 0x07, 0x9a, 0x97, 0x9c, 0x47, 0x93, 0xf2, 0xf2, 0x00,0xb3, 0xd7, 0x57, 0x00, 0x85, 0x8b, 0x8d, 0xc3, 0x83, 0x47, 0x07, 0x00, 0x93, 0xd2, 0x47, 0x00,0xaa, 0x02, 0xbd, 0x8b, 0x9a, 0x92, 0xc1, 0x07, 0x05, 0x43, 0xb3, 0x17, 0xf3, 0x00, 0x23, 0xa8,@@ -257,7 +257,7 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0x05, 0x8a, 0x75, 0xfe, 0x91, 0x07, 0x91, 0x06, 0xe3, 0x98, 0xb7, 0xfe, 0xc1, 0x67, 0x93, 0x87,0x07, 0x04, 0x1c, 0xcb, 0x37, 0x27, 0x02, 0x40, 0x5c, 0x47, 0x85, 0x8b, 0xf5, 0xff, 0xb7, 0x27,0x02, 0x40, 0x13, 0x07, 0x00, 0x08, 0x98, 0xcb, 0xfd, 0x57, 0x23, 0x90, 0xf1, 0xc2, 0x01, 0xbb,- 0x12, 0x45, 0x32, 0xc8, 0x3a, 0xc6, 0xef, 0xf0, 0x6f, 0x97, 0xe3, 0x12, 0x05, 0xd6, 0x12, 0x45,+ 0x02, 0x45, 0x32, 0xc8, 0x3a, 0xc6, 0xef, 0xf0, 0x6f, 0x97, 0xe3, 0x12, 0x05, 0xd6, 0x02, 0x45,0xef, 0xf0, 0xef, 0x9a, 0x32, 0x47, 0x39, 0xe5, 0x92, 0x57, 0xe3, 0x98, 0x07, 0xd4, 0xa2, 0x47,0x42, 0x46, 0x83, 0xc6, 0x07, 0x00, 0x93, 0xd7, 0x46, 0x00, 0xaa, 0x07, 0xb2, 0x97, 0x9c, 0x47,0xbd, 0x8a, 0xb3, 0xd7, 0xd7, 0x00, 0x85, 0x8b, 0xe3, 0x89, 0x07, 0xd2, 0x83, 0xc7, 0x04, 0x02,@@ -279,9 +279,9 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0x94, 0xcb, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa, 0x10, 0x47, 0x61, 0x8e, 0x63, 0x09, 0xc4, 0x0a,0xfd, 0x16, 0xfd, 0xfa, 0x02, 0xca, 0xb2, 0x46, 0x94, 0xcb, 0xd2, 0x46, 0x99, 0xce, 0x42, 0x46,0x85, 0x46, 0xa1, 0x45, 0xb3, 0x92, 0xc6, 0x00, 0x01, 0x46, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa,- 0x08, 0x47, 0x61, 0x8d, 0x41, 0xc9, 0xfd, 0x16, 0xe5, 0xfe, 0x02, 0xca, 0x12, 0x45, 0x23, 0x84,+ 0x08, 0x47, 0x61, 0x8d, 0x41, 0xc9, 0xfd, 0x16, 0xe5, 0xfe, 0x02, 0xca, 0x02, 0x45, 0x23, 0x84,0x04, 0x02, 0xef, 0xf0, 0x4f, 0xab, 0xd2, 0x47, 0xe3, 0x8b, 0x07, 0xbe, 0x85, 0x47, 0x23, 0x8c,- 0xf4, 0x00, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0x02, 0x45, 0xd8, 0xcc, 0x22, 0x57, 0x23, 0x80,+ 0xf4, 0x00, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0x12, 0x45, 0xd8, 0xcc, 0x22, 0x57, 0x23, 0x80,0xe4, 0x00, 0x9c, 0x47, 0xdc, 0xc0, 0xef, 0xf0, 0xaf, 0x86, 0xd1, 0xbe, 0x03, 0xc6, 0xe1, 0xc2,0x3e, 0xc8, 0x1a, 0x85, 0x3e, 0x96, 0x7d, 0x8a, 0x93, 0x15, 0x26, 0x00, 0xb2, 0x95, 0x13, 0x86,0xc1, 0xc4, 0xb2, 0x95, 0x11, 0x46, 0x36, 0xce, 0x3a, 0xca, 0x2e, 0xc6, 0xef, 0xf0, 0x7f, 0x8f,@@ -296,101 +296,100 @@ const uint8_t keybit_image[] __attribute__((aligned(4))) = {0xa4, 0x00, 0xfd, 0x16, 0xfd, 0xfa, 0x15, 0xb7, 0x94, 0x47, 0x22, 0x55, 0xfd, 0x15, 0xb3, 0xf6,0xd2, 0x00, 0xb3, 0x36, 0xd0, 0x00, 0x06, 0x05, 0xc9, 0x8e, 0x93, 0xf6, 0xf6, 0x0f, 0x36, 0xd4,0xe9, 0xf1, 0x93, 0x06, 0x50, 0x0a, 0xe3, 0x12, 0xd6, 0xf0, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa,- 0x10, 0x47, 0x61, 0x8e, 0x63, 0x0d, 0x06, 0x54, 0xfd, 0x16, 0xfd, 0xfa, 0xfd, 0xb5, 0x33, 0xd6,+ 0x10, 0x47, 0x61, 0x8e, 0x63, 0x03, 0x06, 0x54, 0xfd, 0x16, 0xfd, 0xfa, 0xfd, 0xb5, 0x33, 0xd6,0x63, 0x40, 0x05, 0x8a, 0x19, 0xce, 0x32, 0x46, 0x90, 0xcb, 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa,0x83, 0x20, 0x87, 0x00, 0xb3, 0x70, 0x14, 0x00, 0x63, 0x07, 0x14, 0x00, 0x7d, 0x16, 0x6d, 0xfa,- 0x59, 0xa3, 0x42, 0x56, 0xd5, 0xb7, 0x7d, 0x13, 0x7d, 0x56, 0x63, 0x13, 0xc3, 0x56, 0x32, 0x56,- 0x85, 0x05, 0x63, 0xca, 0xc5, 0x54, 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa, 0x0c, 0x47, 0xe1, 0x8d,- 0x63, 0x8b, 0x05, 0x4e, 0x7d, 0x16, 0x7d, 0xfa, 0xb9, 0xab, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa,+ 0x8d, 0xab, 0x42, 0x56, 0xd5, 0xb7, 0x7d, 0x13, 0x7d, 0x56, 0x63, 0x19, 0xc3, 0x54, 0x32, 0x56,+ 0x85, 0x05, 0x63, 0xc0, 0xc5, 0x54, 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa, 0x0c, 0x47, 0xe1, 0x8d,+ 0x63, 0x81, 0x05, 0x4e, 0x7d, 0x16, 0x7d, 0xfa, 0xa9, 0xa3, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa,0x0c, 0x47, 0xe1, 0x8d, 0x63, 0x05, 0xb4, 0x00, 0xfd, 0x16, 0xfd, 0xfa, 0x79, 0xb5, 0x94, 0x47,- 0x82, 0x45, 0x7d, 0x16, 0xb3, 0xf6, 0xd2, 0x00, 0xb3, 0x36, 0xd0, 0x00, 0x86, 0x05, 0xcd, 0x8e,- 0x93, 0xf6, 0xf6, 0x0f, 0x36, 0xc0, 0x21, 0xce, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa, 0x0c, 0x47,+ 0x92, 0x45, 0x7d, 0x16, 0xb3, 0xf6, 0xd2, 0x00, 0xb3, 0x36, 0xd0, 0x00, 0x86, 0x05, 0xcd, 0x8e,+ 0x93, 0xf6, 0xf6, 0x0f, 0x36, 0xc2, 0x21, 0xce, 0x85, 0x66, 0x93, 0x86, 0x06, 0xfa, 0x0c, 0x47,0xe1, 0x8d, 0xe1, 0xd5, 0xfd, 0x16, 0xe5, 0xfe, 0x8d, 0xb5, 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa,0x08, 0x47, 0x61, 0x8d, 0x63, 0x05, 0xa4, 0x00, 0x7d, 0x16, 0x7d, 0xfa, 0xb9, 0xb5, 0x90, 0x47,0x86, 0x06, 0xfd, 0x15, 0x33, 0xf6, 0xc2, 0x00, 0x33, 0x36, 0xc0, 0x00, 0xd1, 0x8e, 0x93, 0xf6,- 0xf6, 0x0f, 0x85, 0xe1, 0x82, 0x47, 0x93, 0xc6, 0xf6, 0xff, 0x93, 0xf6, 0xf6, 0x0f, 0x63, 0x96,- 0xd7, 0x00, 0x82, 0x47, 0x72, 0x47, 0xe3, 0x73, 0xf7, 0xe2, 0x02, 0xc0, 0x05, 0xb5, 0xa1, 0x45,+ 0xf6, 0x0f, 0x85, 0xe1, 0x92, 0x47, 0x93, 0xc6, 0xf6, 0xff, 0x93, 0xf6, 0xf6, 0x0f, 0x63, 0x96,+ 0xd7, 0x00, 0x92, 0x47, 0x72, 0x47, 0xe3, 0x73, 0xf7, 0xe2, 0x02, 0xc2, 0x05, 0xb5, 0xa1, 0x45,0x81, 0x46, 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa, 0x08, 0x47, 0x61, 0x8d, 0x5d, 0xd5, 0x7d, 0x16,0x65, 0xfe, 0x21, 0xb5, 0xe3, 0x53, 0xf0, 0xa4, 0xfd, 0x17, 0x35, 0xbc, 0xe3, 0x1c, 0x07, 0xa4,0xa3, 0x86, 0x01, 0xc2, 0x81, 0xbc, 0x3e, 0x87, 0x63, 0xf3, 0xf5, 0x00, 0x2e, 0x87, 0x93, 0x77,- 0xf7, 0x0f, 0x79, 0xb4, 0x85, 0x07, 0x23, 0x81, 0xf1, 0xc2, 0x82, 0x54, 0x93, 0x87, 0x41, 0xc0,- 0x3e, 0xca, 0x02, 0xc4, 0x22, 0x45, 0xef, 0xe0, 0x7f, 0xde, 0x83, 0xc7, 0x21, 0xc2, 0x2a, 0xd8,- 0x3e, 0xc8, 0x63, 0x1a, 0x05, 0x1e, 0x03, 0xc7, 0x04, 0x00, 0x93, 0x07, 0xf0, 0x0f, 0x63, 0x14,- 0xf7, 0x1e, 0x83, 0xc7, 0x84, 0x02, 0x63, 0x90, 0x07, 0x1e, 0x83, 0xc7, 0x84, 0x00, 0x63, 0x99,- 0xe7, 0x14, 0x83, 0xc7, 0x84, 0x00, 0x13, 0x07, 0xf0, 0x0f, 0x63, 0x98, 0xe7, 0x1a, 0xb7, 0xf7,- 0x00, 0xe0, 0x9c, 0x47, 0xd8, 0x54, 0x01, 0x44, 0x99, 0x8f, 0x63, 0xce, 0x07, 0x1a, 0xb7, 0xf7,- 0x00, 0xe0, 0x9c, 0x47, 0x85, 0x65, 0x93, 0x85, 0x05, 0x77, 0x3e, 0xc2, 0xc6, 0x47, 0x03, 0xc5,- 0x07, 0x00, 0x1d, 0x89, 0x13, 0x05, 0x45, 0x06, 0xef, 0xe0, 0x9f, 0xcd, 0x92, 0x47, 0xa2, 0x46,- 0x3e, 0x95, 0xd2, 0x47, 0x23, 0xae, 0xd1, 0xc0, 0x03, 0xc7, 0xf1, 0xc2, 0xc8, 0xd4, 0x03, 0xc5,- 0x07, 0x00, 0x83, 0xc7, 0x17, 0x00, 0xba, 0xcc, 0xb7, 0x16, 0x01, 0x40, 0x13, 0xd7, 0x47, 0x00,- 0x93, 0x86, 0x06, 0x80, 0x2a, 0x07, 0x36, 0x97, 0x14, 0x47, 0xa3, 0x00, 0xf1, 0x06, 0xbd, 0x8b,- 0xb3, 0xd6, 0xf6, 0x00, 0x85, 0x8a, 0x23, 0x00, 0xa1, 0x06, 0x36, 0xd6, 0xb5, 0xca, 0xc1, 0x07,- 0x85, 0x46, 0xb3, 0x97, 0xf6, 0x00, 0x1c, 0xcb, 0x63, 0x15, 0x04, 0x16, 0x03, 0x45, 0x01, 0x06,- 0x85, 0x66, 0x93, 0x86, 0x06, 0x9b, 0x13, 0x06, 0xc0, 0x5d, 0x81, 0x45, 0xef, 0xf0, 0x0f, 0x98,- 0xb3, 0x37, 0xa0, 0x00, 0x3e, 0xc6, 0x0d, 0x45, 0xef, 0xe0, 0xff, 0xcf, 0x03, 0x45, 0x11, 0x06,- 0x37, 0x14, 0x01, 0x40, 0x13, 0x04, 0x04, 0x80, 0x93, 0x57, 0x45, 0x00, 0xaa, 0x07, 0x93, 0x76,- 0xf5, 0x00, 0x05, 0x47, 0xa2, 0x97, 0xb3, 0x16, 0xd7, 0x00, 0x94, 0xcb, 0xb2, 0x47, 0x63, 0x9e,- 0x07, 0x12, 0x03, 0x47, 0x11, 0x06, 0xb7, 0x16, 0x01, 0x40, 0x93, 0x86, 0x06, 0x80, 0x93, 0x57,- 0x47, 0x00, 0xaa, 0x07, 0xb6, 0x97, 0x3d, 0x8b, 0x85, 0x46, 0x33, 0x97, 0xe6, 0x00, 0x98, 0xcb,- 0x01, 0x44, 0x02, 0xc6, 0x22, 0x45, 0x7d, 0x57, 0x23, 0xae, 0xe1, 0xc0, 0xef, 0xe0, 0xbf, 0xf6,- 0xb2, 0x47, 0xf1, 0xcb, 0x85, 0x47, 0x23, 0x8c, 0xf4, 0x00, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47,- 0xd8, 0xcc, 0x03, 0x47, 0x01, 0x09, 0x23, 0x84, 0xe4, 0x00, 0x9c, 0x47, 0x18, 0x09, 0xdc, 0xc4,- 0xc2, 0x57, 0x15, 0x07, 0x63, 0xd9, 0x87, 0x0a, 0x93, 0x05, 0xd7, 0xff, 0x11, 0x46, 0xc8, 0x10,- 0x3a, 0xc2, 0xef, 0xf0, 0x0f, 0xdc, 0x12, 0x47, 0xc8, 0x10, 0x83, 0x47, 0x17, 0x00, 0x23, 0x04,- 0xf1, 0x06, 0xef, 0xe0, 0xff, 0xd1, 0xc2, 0x57, 0x12, 0x47, 0x85, 0x07, 0x3e, 0xd8, 0xc9, 0xbf,- 0x42, 0x47, 0xe3, 0x78, 0xf7, 0xea, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0xdc, 0x44, 0x1d, 0x8f,- 0xb7, 0xf7, 0x36, 0x00, 0x93, 0x87, 0xf7, 0xe7, 0xe3, 0xed, 0xe7, 0xe8, 0x22, 0x45, 0xef, 0xe0,- 0x1f, 0xc9, 0xe3, 0x08, 0x05, 0xe8, 0xd2, 0x47, 0xb7, 0x16, 0x01, 0x40, 0x93, 0x86, 0x06, 0x80,- 0x03, 0xc7, 0x07, 0x00, 0x93, 0x57, 0x47, 0x00, 0xaa, 0x07, 0xb6, 0x97, 0x9c, 0x47, 0x3d, 0x8b,- 0xb3, 0xd7, 0xe7, 0x00, 0x85, 0x8b, 0xe3, 0x96, 0x07, 0xe6, 0xd2, 0x47, 0x03, 0xc7, 0x17, 0x00,- 0x93, 0x57, 0x47, 0x00, 0xaa, 0x07, 0xb6, 0x97, 0x9c, 0x47, 0x3d, 0x8b, 0xb3, 0xd7, 0xe7, 0x00,- 0x85, 0x8b, 0xe3, 0x88, 0x07, 0xe4, 0x05, 0x44, 0x9d, 0xb5, 0x42, 0x47, 0xe3, 0x69, 0xf7, 0xe4,- 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0xdc, 0x44, 0x1d, 0x8f, 0xb7, 0x27, 0xb7, 0x00, 0x93, 0x87,- 0xf7, 0xaf, 0xe3, 0xee, 0xe7, 0xe2, 0xa2, 0x47, 0x93, 0x84, 0x04, 0x03, 0x85, 0x07, 0x3e, 0xc4,- 0xd2, 0x47, 0x22, 0x47, 0x95, 0x07, 0x3e, 0xca, 0x91, 0x47, 0xe3, 0x15, 0xf7, 0xde, 0x6f, 0xf0,- 0x9f, 0x87, 0x85, 0x66, 0x93, 0x86, 0x06, 0x9b, 0x13, 0x06, 0xc0, 0x5d, 0x85, 0x45, 0xef, 0xf0,- 0xef, 0x81, 0x2a, 0xc6, 0xe3, 0x14, 0x05, 0xe8, 0x79, 0xbd, 0x81, 0x46, 0x13, 0x06, 0x80, 0x0c,- 0x85, 0x45, 0xef, 0xf0, 0xaf, 0x80, 0xe3, 0x0e, 0x05, 0xea, 0x03, 0x45, 0x01, 0x06, 0x81, 0x46,- 0x13, 0x06, 0x80, 0x0c, 0x85, 0x45, 0xef, 0xe0, 0x7f, 0xff, 0xe3, 0x04, 0x05, 0xea, 0x83, 0x46,- 0x11, 0x06, 0xbd, 0x45, 0x0d, 0x46, 0x93, 0xd7, 0x46, 0x00, 0xaa, 0x07, 0xa2, 0x97, 0x13, 0xf7,- 0xf6, 0x00, 0x3e, 0xce, 0xba, 0xc0, 0x9c, 0x43, 0x0a, 0x07, 0xb3, 0x96, 0xe5, 0x00, 0x3a, 0xda,- 0x13, 0xc7, 0xf6, 0xff, 0xba, 0xc2, 0xf9, 0x8f, 0x52, 0x57, 0x0d, 0x45, 0xb3, 0x16, 0xe6, 0x00,- 0x72, 0x47, 0xd5, 0x8f, 0x1c, 0xc3, 0x83, 0x47, 0x01, 0x06, 0x93, 0xd6, 0x47, 0x00, 0xaa, 0x06,- 0x33, 0x87, 0x86, 0x00, 0xbd, 0x8b, 0x93, 0x96, 0x27, 0x00, 0x3a, 0xc2, 0x18, 0x43, 0xb3, 0x95,- 0xd5, 0x00, 0xbe, 0xc4, 0x93, 0xc7, 0xf5, 0xff, 0x3e, 0xdc, 0x7d, 0x8f, 0x92, 0x47, 0x33, 0x16,- 0xd6, 0x00, 0x51, 0x8f, 0x98, 0xc3, 0x36, 0xde, 0xef, 0xe0, 0xff, 0xb0, 0x01, 0x46, 0x93, 0x05,- 0x50, 0x0a, 0x88, 0x10, 0xef, 0xf0, 0x8f, 0x80, 0xc2, 0x45, 0x01, 0x46, 0x88, 0x10, 0xef, 0xe0,- 0xff, 0xff, 0xa6, 0x47, 0x05, 0x47, 0xf2, 0x56, 0xb3, 0x17, 0xf7, 0x00, 0xbe, 0xc4, 0x26, 0x47,- 0x92, 0x47, 0x85, 0x45, 0x88, 0x10, 0x98, 0xcb, 0x15, 0x47, 0x33, 0x17, 0xd7, 0x00, 0x9c, 0x43,- 0xba, 0xc6, 0x62, 0x57, 0xf9, 0x8f, 0x36, 0x47, 0xd9, 0x8f, 0x12, 0x47, 0x1c, 0xc3, 0xef, 0xf0,- 0xcf, 0x88, 0x2a, 0x84, 0x23, 0x08, 0xa1, 0x08, 0x81, 0x45, 0x88, 0x10, 0xef, 0xf0, 0xef, 0x87,- 0xa2, 0x85, 0x2a, 0xc8, 0xa3, 0x08, 0xa1, 0x08, 0x01, 0x45, 0xef, 0xe0, 0xdf, 0xf8, 0xc2, 0x45,- 0xef, 0xe0, 0x7f, 0xf8, 0xc2, 0x47, 0x2a, 0x84, 0x13, 0x97, 0x27, 0x00, 0x3e, 0x97, 0xc2, 0x46,+ 0xf7, 0x0f, 0x79, 0xb4, 0x85, 0x07, 0x23, 0x81, 0xf1, 0xc2, 0x93, 0x87, 0x41, 0xc0, 0x3e, 0xca,+ 0x82, 0x57, 0x02, 0xc4, 0x3e, 0xc0, 0x22, 0x45, 0xef, 0xe0, 0x5f, 0xde, 0x83, 0xc7, 0x21, 0xc2,+ 0x2a, 0xd8, 0x3e, 0xc8, 0x2d, 0xed, 0x82, 0x47, 0x13, 0x07, 0xf0, 0x0f, 0x83, 0xc7, 0x07, 0x00,+ 0x63, 0x97, 0xe7, 0x06, 0x02, 0x47, 0x03, 0x47, 0x87, 0x02, 0x35, 0xe3, 0x02, 0x47, 0x03, 0x47,+ 0x87, 0x00, 0x63, 0x08, 0xf7, 0x00, 0xc2, 0x47, 0x63, 0xf5, 0xe7, 0x00, 0xb7, 0xf7, 0x00, 0xe0,+ 0x9c, 0x47, 0xd2, 0x47, 0x37, 0x16, 0x01, 0x40, 0x13, 0x06, 0x06, 0x80, 0x03, 0xc4, 0x07, 0x00,+ 0x93, 0x57, 0x44, 0x00, 0xaa, 0x07, 0xb3, 0x84, 0xc7, 0x00, 0x9c, 0x44, 0x93, 0x76, 0xf4, 0x00,+ 0x36, 0xc6, 0xb3, 0xd7, 0xd7, 0x00, 0x85, 0x8b, 0xb1, 0xe3, 0xd2, 0x47, 0x83, 0xc6, 0x17, 0x00,+ 0x93, 0xd7, 0x46, 0x00, 0xaa, 0x07, 0xb2, 0x97, 0x9c, 0x47, 0xbd, 0x8a, 0xb3, 0xd7, 0xd7, 0x00,+ 0x85, 0x8b, 0x8d, 0xc7, 0x22, 0x45, 0xef, 0xe0, 0x9f, 0xda, 0x05, 0x46, 0x21, 0xed, 0xa2, 0x47,+ 0x85, 0x07, 0x3e, 0xc4, 0x82, 0x47, 0x22, 0x47, 0x93, 0x87, 0x07, 0x03, 0x3e, 0xc0, 0xd2, 0x47,+ 0x95, 0x07, 0x3e, 0xca, 0x91, 0x47, 0xe3, 0x10, 0xf7, 0xf6, 0xf5, 0xb2, 0x93, 0x07, 0xf0, 0x0f,+ 0x63, 0x01, 0xf7, 0x02, 0xc2, 0x47, 0x63, 0xee, 0xe7, 0x00, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47,+ 0x82, 0x47, 0xdc, 0x47, 0x1d, 0x8f, 0xb7, 0x27, 0xb7, 0x00, 0x93, 0x87, 0xf7, 0xaf, 0xe3, 0xf0,+ 0xe7, 0xfc, 0x02, 0x47, 0xb7, 0xf7, 0x00, 0xe0, 0x9c, 0x47, 0x58, 0x57, 0x99, 0x8f, 0xe3, 0xc8,+ 0x07, 0xfa, 0x01, 0x46, 0xb7, 0xf7, 0x00, 0xe0, 0x9c, 0x47, 0x85, 0x65, 0x93, 0x85, 0x05, 0x77,+ 0x3e, 0xc6, 0xc6, 0x47, 0x32, 0xce, 0x03, 0xc5, 0x07, 0x00, 0x1d, 0x89, 0x13, 0x05, 0x45, 0x06,+ 0xef, 0xe0, 0x1f, 0xc4, 0xb2, 0x47, 0xa2, 0x46, 0x3e, 0x95, 0x82, 0x47, 0x23, 0xae, 0xd1, 0xc0,+ 0xc8, 0xd7, 0xd2, 0x47, 0x03, 0xc7, 0xf1, 0xc2, 0xb7, 0x16, 0x01, 0x40, 0x83, 0xc7, 0x17, 0x00,+ 0xba, 0xcc, 0x93, 0x86, 0x06, 0x80, 0x13, 0xd7, 0x47, 0x00, 0x2a, 0x07, 0x36, 0x97, 0x14, 0x47,+ 0xa3, 0x00, 0xf1, 0x06, 0xbd, 0x8b, 0xb3, 0xd6, 0xf6, 0x00, 0x85, 0x8a, 0x23, 0x00, 0x81, 0x06,+ 0x36, 0xd6, 0xc9, 0xc2, 0x72, 0x46, 0x01, 0xea, 0x94, 0x44, 0x93, 0x75, 0xf4, 0x00, 0xb3, 0xd6,+ 0xb6, 0x00, 0x85, 0x8a, 0xa5, 0xca, 0xc1, 0x07, 0x85, 0x46, 0xb3, 0x97, 0xf6, 0x00, 0x1c, 0xcb,+ 0x71, 0xe2, 0x03, 0x45, 0x01, 0x06, 0x85, 0x66, 0x93, 0x86, 0x06, 0x9b, 0x13, 0x06, 0xc0, 0x5d,+ 0x81, 0x45, 0xef, 0xf0, 0xaf, 0x8d, 0xb3, 0x37, 0xa0, 0x00, 0x3e, 0xc6, 0x0d, 0x45, 0xef, 0xe0,+ 0x9f, 0xc5, 0x03, 0x45, 0x11, 0x06, 0xb7, 0x14, 0x01, 0x40, 0x93, 0x84, 0x04, 0x80, 0x93, 0x57,+ 0x45, 0x00, 0xaa, 0x07, 0x13, 0x77, 0xf5, 0x00, 0x05, 0x44, 0xa6, 0x97, 0x33, 0x17, 0xe4, 0x00,+ 0x98, 0xcb, 0xb2, 0x47, 0xc1, 0xef, 0x03, 0x47, 0x11, 0x06, 0xb7, 0x16, 0x01, 0x40, 0x93, 0x86,+ 0x06, 0x80, 0x93, 0x57, 0x47, 0x00, 0xaa, 0x07, 0xb6, 0x97, 0x3d, 0x8b, 0x85, 0x46, 0x33, 0x97,+ 0xe6, 0x00, 0x98, 0xcb, 0x01, 0x44, 0x02, 0xc6, 0x22, 0x45, 0x7d, 0x57, 0x23, 0xae, 0xe1, 0xc0,+ 0xef, 0xe0, 0x7f, 0xec, 0xb2, 0x47, 0xe3, 0x8c, 0x07, 0xea, 0x02, 0x47, 0x85, 0x47, 0x82, 0x46,+ 0x23, 0x0c, 0xf7, 0x00, 0xb7, 0xf7, 0x00, 0xe0, 0x98, 0x47, 0x04, 0x09, 0xd8, 0xce, 0x03, 0x47,+ 0x01, 0x09, 0x23, 0x84, 0xe6, 0x00, 0x9c, 0x47, 0xdc, 0xc6, 0xc2, 0x57, 0x95, 0x04, 0xe3, 0xd8,+ 0x87, 0xe8, 0x11, 0x46, 0x93, 0x85, 0xd4, 0xff, 0xc8, 0x10, 0xef, 0xf0, 0x8f, 0xd1, 0x83, 0xc7,+ 0x14, 0x00, 0xc8, 0x10, 0x23, 0x04, 0xf1, 0x06, 0xef, 0xe0, 0x9f, 0xc7, 0xc2, 0x57, 0x85, 0x07,+ 0x3e, 0xd8, 0xe1, 0xbf, 0x85, 0x66, 0x93, 0x86, 0x06, 0x9b, 0x13, 0x06, 0xc0, 0x5d, 0x85, 0x45,+ 0x22, 0x85, 0xef, 0xf0, 0xaf, 0x81, 0x2a, 0xc6, 0x0d, 0xf5, 0x89, 0xb7, 0x81, 0x46, 0x13, 0x06,+ 0x80, 0x0c, 0x85, 0x45, 0xef, 0xf0, 0x8f, 0x80, 0x39, 0xdd, 0x03, 0x45, 0x01, 0x06, 0x81, 0x46,+ 0x13, 0x06, 0x80, 0x0c, 0x85, 0x45, 0xef, 0xe0, 0x7f, 0xff, 0x31, 0xd5, 0x03, 0x47, 0x11, 0x06,+ 0x3d, 0x46, 0x8d, 0x46, 0x93, 0x57, 0x47, 0x00, 0xaa, 0x07, 0xa6, 0x97, 0x3d, 0x8b, 0x3e, 0xce,+ 0xba, 0xc0, 0x9c, 0x43, 0x0a, 0x07, 0x3a, 0xda, 0x33, 0x17, 0xe6, 0x00, 0x13, 0x47, 0xf7, 0xff,+ 0xba, 0xc2, 0xf9, 0x8f, 0x52, 0x57, 0x0d, 0x45, 0x33, 0x97, 0xe6, 0x00, 0xd9, 0x8f, 0x72, 0x47,+ 0x1c, 0xc3, 0x03, 0x47, 0x01, 0x06, 0x93, 0x57, 0x47, 0x00, 0xaa, 0x07, 0x13, 0x73, 0xf7, 0x00,+ 0xbe, 0x94, 0x13, 0x17, 0x23, 0x00, 0x9c, 0x40, 0x33, 0x16, 0xe6, 0x00, 0x13, 0x46, 0xf6, 0xff,+ 0xb3, 0x96, 0xe6, 0x00, 0xf1, 0x8f, 0xd5, 0x8f, 0x9c, 0xc0, 0x9a, 0xc4, 0x3a, 0xde, 0x32, 0xdc,+ 0xef, 0xe0, 0x7f, 0xb1, 0x01, 0x46, 0x93, 0x05, 0x50, 0x0a, 0x88, 0x10, 0xef, 0xf0, 0x0f, 0x81,+ 0xc2, 0x45, 0x01, 0x46, 0x88, 0x10, 0xef, 0xf0, 0x6f, 0x80, 0x26, 0x43, 0x72, 0x57, 0x95, 0x46,+ 0xb3, 0x17, 0x64, 0x00, 0x33, 0x97, 0xe6, 0x00, 0x9c, 0xc8, 0xba, 0xc6, 0xbe, 0xc4, 0x62, 0x57,+ 0x9c, 0x40, 0x85, 0x45, 0x88, 0x10, 0xf9, 0x8f, 0x36, 0x47, 0xd9, 0x8f, 0x9c, 0xc0, 0xef, 0xf0,+ 0xcf, 0x89, 0x2a, 0x84, 0x23, 0x08, 0xa1, 0x08, 0x81, 0x45, 0x88, 0x10, 0xef, 0xf0, 0xef, 0x88,+ 0xa2, 0x85, 0x2a, 0xc8, 0xa3, 0x08, 0xa1, 0x08, 0x01, 0x45, 0xef, 0xe0, 0xdf, 0xf9, 0xc2, 0x45,+ 0xef, 0xe0, 0x7f, 0xf9, 0xc2, 0x47, 0x2a, 0x84, 0x13, 0x97, 0x27, 0x00, 0x3e, 0x97, 0xc2, 0x46,0xa1, 0x47, 0x63, 0xe3, 0xd7, 0x06, 0xb2, 0x57, 0x85, 0x07, 0x3e, 0xde, 0xb2, 0x57, 0xfd, 0x17,- 0x63, 0xc7, 0xe7, 0x02, 0x81, 0x45, 0x88, 0x10, 0xef, 0xf0, 0x2f, 0x84, 0x63, 0x16, 0xa4, 0x04,+ 0x63, 0xc7, 0xe7, 0x02, 0x81, 0x45, 0x88, 0x10, 0xef, 0xf0, 0x2f, 0x85, 0x63, 0x16, 0xa4, 0x04,0x66, 0x47, 0x93, 0x07, 0x00, 0x02, 0x99, 0x8f, 0x42, 0x47, 0x3e, 0x84, 0x93, 0xf7, 0xf7, 0x0f,0x63, 0x74, 0xf7, 0x00, 0x03, 0x44, 0x01, 0x01, 0x13, 0x74, 0xf4, 0x0f, 0x05, 0xa8, 0x81, 0x45,- 0x88, 0x10, 0xba, 0xce, 0xef, 0xf0, 0x6f, 0x81, 0xf2, 0x57, 0x98, 0x10, 0xaa, 0x85, 0x93, 0x87,- 0x07, 0x07, 0xba, 0x97, 0x23, 0x80, 0xa7, 0xfc, 0x22, 0x85, 0xef, 0xe0, 0xdf, 0xf1, 0xf2, 0x57,+ 0x88, 0x10, 0xba, 0xce, 0xef, 0xf0, 0x6f, 0x82, 0xf2, 0x57, 0x98, 0x10, 0xaa, 0x85, 0x93, 0x87,+ 0x07, 0x07, 0xba, 0x97, 0x23, 0x80, 0xa7, 0xfc, 0x22, 0x85, 0xef, 0xe0, 0xdf, 0xf2, 0xf2, 0x57,0x76, 0x47, 0x2a, 0x84, 0x3e, 0xd6, 0x61, 0xbf, 0x02, 0xc6, 0x01, 0x44, 0x05, 0x46, 0xa2, 0x85,- 0x88, 0x10, 0xef, 0xe0, 0xbf, 0xf2, 0x93, 0x45, 0xf4, 0xff, 0x01, 0x46, 0x93, 0xf5, 0xf5, 0x0f,- 0x88, 0x10, 0xef, 0xe0, 0xbf, 0xf1, 0x92, 0x47, 0x26, 0x47, 0xd2, 0x56, 0x98, 0xcb, 0x9c, 0x43,- 0x62, 0x57, 0xf9, 0x8f, 0x36, 0x47, 0xd9, 0x8f, 0x12, 0x47, 0x1c, 0xc3, 0x06, 0x47, 0x85, 0x47,- 0xb3, 0x97, 0xe7, 0x00, 0x72, 0x47, 0x1c, 0xcb, 0x1c, 0x43, 0x16, 0x47, 0xf9, 0x8f, 0x15, 0x47,- 0x33, 0x17, 0xd7, 0x00, 0xd9, 0x8f, 0x72, 0x47, 0x1c, 0xc3, 0xb2, 0x47, 0xe3, 0x94, 0x07, 0xd2,- 0x05, 0xb3, 0x63, 0x8b, 0x07, 0xf2, 0x83, 0x47, 0x07, 0x00, 0x13, 0xd3, 0x47, 0x00, 0x2a, 0x03,- 0xbd, 0x8b, 0xb3, 0x17, 0xf5, 0x00, 0x32, 0x93, 0x23, 0x28, 0xf3, 0x00, 0xe2, 0x47, 0x23, 0x84,- 0x07, 0x02, 0x6f, 0xf0, 0x6f, 0xf1, 0x32, 0x46, 0x02, 0xc0, 0x90, 0xcb, 0x90, 0x43, 0xf1, 0x8e,- 0x15, 0x46, 0x33, 0x16, 0xa6, 0x00, 0xd1, 0x8e, 0x94, 0xc3, 0x21, 0x46, 0x35, 0xb6, 0x3e, 0xdc,- 0xb2, 0x57, 0x0d, 0x45, 0x16, 0xde, 0x8d, 0x07, 0x3a, 0xda, 0x3e, 0xd6, 0xef, 0xe0, 0xbf, 0x98,- 0xe2, 0x57, 0x42, 0x47, 0xbd, 0x46, 0x90, 0x43, 0x13, 0x15, 0x27, 0x00, 0xb3, 0x96, 0xa6, 0x00,- 0x93, 0xc6, 0xf6, 0xff, 0x8d, 0x45, 0xb3, 0x95, 0xa5, 0x00, 0x75, 0x8e, 0x52, 0x57, 0xf2, 0x52,- 0x4d, 0x8e, 0x90, 0xc3, 0x81, 0x45, 0x10, 0x09, 0x2e, 0x96, 0x83, 0x43, 0x06, 0x00, 0x1d, 0x43,- 0x05, 0x66, 0x13, 0x06, 0x06, 0xfa, 0x83, 0x20, 0x87, 0x00, 0xb3, 0x70, 0x14, 0x00, 0xe3, 0x80,- 0x00, 0xa6, 0x7d, 0x16, 0x6d, 0xfa, 0x32, 0x47, 0x98, 0xcb, 0x98, 0x43, 0x75, 0x8f, 0x95, 0x46,- 0xb3, 0x96, 0xa6, 0x00, 0x55, 0x8f, 0x98, 0xc3, 0x0d, 0xba, 0x00, 0x00, 0x96, 0x03, 0x00, 0x00,- 0xde, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00,- 0xac, 0x03, 0x00, 0x00, 0xb2, 0x03, 0x00, 0x00, 0xbc, 0x03, 0x00, 0x00, 0xc2, 0x03, 0x00, 0x00,- 0x24, 0x32, 0x53, 0x00, 0x00, 0x21, 0x22, 0x45, 0x00, 0x00, 0x34, 0x35, 0x57, 0x00, 0x00, 0x01,- 0x02, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,+ 0x88, 0x10, 0xef, 0xe0, 0xbf, 0xf3, 0x93, 0x45, 0xf4, 0xff, 0x01, 0x46, 0x93, 0xf5, 0xf5, 0x0f,+ 0x88, 0x10, 0xef, 0xe0, 0xbf, 0xf2, 0xa6, 0x47, 0x62, 0x57, 0xd2, 0x56, 0x9c, 0xc8, 0x9c, 0x40,+ 0xf9, 0x8f, 0x36, 0x47, 0xd9, 0x8f, 0x06, 0x47, 0x9c, 0xc0, 0x85, 0x47, 0xb3, 0x97, 0xe7, 0x00,+ 0x72, 0x47, 0x1c, 0xcb, 0x1c, 0x43, 0x16, 0x47, 0xf9, 0x8f, 0x15, 0x47, 0x33, 0x17, 0xd7, 0x00,+ 0xd9, 0x8f, 0x72, 0x47, 0x1c, 0xc3, 0xb2, 0x47, 0xe3, 0x90, 0x07, 0xde, 0xe1, 0xbb, 0x63, 0x85,+ 0x07, 0xf4, 0x83, 0x47, 0x07, 0x00, 0x13, 0xd3, 0x47, 0x00, 0x2a, 0x03, 0xbd, 0x8b, 0xb3, 0x17,+ 0xf5, 0x00, 0x32, 0x93, 0x23, 0x28, 0xf3, 0x00, 0xe2, 0x47, 0x23, 0x84, 0x07, 0x02, 0x6f, 0xf0,+ 0xaf, 0xf2, 0x32, 0x46, 0x02, 0xc2, 0x90, 0xcb, 0x8c, 0x43, 0x15, 0x46, 0x33, 0x16, 0xa6, 0x00,+ 0xed, 0x8e, 0xd1, 0x8e, 0x94, 0xc3, 0x21, 0x46, 0x81, 0xb6, 0x3e, 0xdc, 0xb2, 0x57, 0x0d, 0x45,+ 0x16, 0xde, 0x8d, 0x07, 0x3a, 0xda, 0x3e, 0xd6, 0xef, 0xe0, 0xff, 0x99, 0xe2, 0x57, 0x42, 0x47,+ 0xbd, 0x46, 0x90, 0x43, 0x13, 0x15, 0x27, 0x00, 0xb3, 0x96, 0xa6, 0x00, 0x93, 0xc6, 0xf6, 0xff,+ 0x8d, 0x45, 0xb3, 0x95, 0xa5, 0x00, 0x75, 0x8e, 0x52, 0x57, 0xf2, 0x52, 0x4d, 0x8e, 0x90, 0xc3,+ 0x81, 0x45, 0x10, 0x09, 0x2e, 0x96, 0x83, 0x43, 0x06, 0x00, 0x1d, 0x43, 0x05, 0x66, 0x13, 0x06,+ 0x06, 0xfa, 0x83, 0x20, 0x87, 0x00, 0xb3, 0x70, 0x14, 0x00, 0xe3, 0x8a, 0x00, 0xa6, 0x7d, 0x16,+ 0x6d, 0xfa, 0x32, 0x47, 0x98, 0xcb, 0x98, 0x43, 0x75, 0x8f, 0x95, 0x46, 0xb3, 0x96, 0xa6, 0x00,+ 0x55, 0x8f, 0x98, 0xc3, 0x99, 0xb2, 0x00, 0x00, 0x96, 0x03, 0x00, 0x00, 0xde, 0x03, 0x00, 0x00,+ 0xac, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00, 0xac, 0x03, 0x00, 0x00,+ 0xb2, 0x03, 0x00, 0x00, 0xbc, 0x03, 0x00, 0x00, 0xc2, 0x03, 0x00, 0x00, 0x24, 0x32, 0x53, 0x00,+ 0x00, 0x21, 0x22, 0x45, 0x00, 0x00, 0x34, 0x35, 0x57, 0x00, 0x00, 0x01, 0x02, 0x4e, 0x00, 0x00,+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,};diff --git a/firmware/Core/Src/main.c b/firmware/Core/Src/main.cindex 0f7714e..5a49112 100644--- a/firmware/Core/Src/main.c+++ b/firmware/Core/Src/main.c@@ -26,6 +26,7 @@#include "ch32v003_swio.h"#include "keybit_image.h"#include "keybit_bus.h"+#include "proto.h"/* USER CODE END Includes */@@ -95,18 +96,21 @@ static void LED_Set(uint8_t r, uint8_t g, uint8_t b)/* Status LED, highest priority first:* red Keybit on the dock failed to flash (until it's taken off)+ * red blinking: SDA held low, a Keybit is on backwards (bus paused)* white blinking: a Keybit just connected on a side* blue Keybit on the dock (flashed or up to date)* green idle */-static uint8_t dock_present, dock_failed;+static uint8_t dock_present, dock_failed, bus_held;static uint32_t white_until;#define WHITE_BLINK_MS 1200+#define BUS_HELD_MS 100static void LED_Update(void){uint32_t now = HAL_GetTick();if (dock_failed) LED_Set(1, 0, 0);+ else if (bus_held) LED_Set(((now / 250) & 1) == 0, 0, 0);else if ((int32_t)(white_until - now) > 0) {uint8_t on = ((now / 100) & 1) == 0;LED_Set(on, on, on);@@ -152,7 +156,22 @@ static void Keybit_Dock_Poll(void)/* Hand addresses to new Keybits, then refresh the list of who is there. */static void Keybit_Bus_Poll(void){- static uint32_t last_scan, last_keys;+ static uint32_t last_scan, last_keys, held_since;++ /* A backwards Keybit holds SDA low; tell the host once it has lasted+ * BUS_HELD_MS and once it clears, and leave the bus alone meanwhile. */+ uint32_t now = HAL_GetTick();+ if (!keybit_bus_held()) {+ held_since = now;+ if (bus_held) {+ bus_held = 0;+ PROTO_Send("OK BUS clear");+ }+ } else if (!bus_held && now - held_since >= BUS_HELD_MS) {+ bus_held = 1;+ PROTO_Send("ERR bus SDA held low, a Keybit on the Keyword may be turned the wrong way");+ }+ if (keybit_bus_jammed()) return;if (HAL_GetTick() - last_keys >= KEYBIT_KEYS_MS) {last_keys = HAL_GetTick();keybit_changed |= keybit_bus_poll_keys(&hi2c3, keybits, keybit_count);diff --git a/firmware/keybit/link.c b/firmware/keybit/link.cindex a0eb296..de7121e 100644--- a/firmware/keybit/link.c+++ b/firmware/keybit/link.c@@ -80,6 +80,10 @@ int link_poll(const link_pins_t *p, int doorbell, uint8_t my_depth,link_reply_t *child, uint8_t room, uint8_t *kept, link_idle_fn idle){if (!CK(p)) return 0;+ /* DT low with CK high and no doorbell expected: a Keybit turned the+ * wrong way round has our DT on its GND and our CK on its 3V3. Pulling+ * CK low would short its rail through our pin, so leave the side alone. */+ if (!doorbell && !DT(p)) return 0;CK_LOW(p);/* A ringing child already holds DT low, so wait for it to let godiff --git a/firmware/keybit/main.c b/firmware/keybit/main.cindex 6a2efce..97c55e1 100644--- a/firmware/keybit/main.c+++ b/firmware/keybit/main.c@@ -62,7 +62,7 @@#include "link.h"#include <string.h>-#define FW_VERSION 4+#define FW_VERSION 5#define KEYBIT_DEFAULT_ADDR 0x30#define LINK_ADDR 0x31 /* reserved: the keyword never assigns it */#define BTN_PIN PD6 /* MX switch to GND */@@ -457,8 +457,14 @@ static void relay(int listening)int child = sd->child_depth != DEPTH_NONE && sd->child_depth > my_depth &&!elapsed(sd->child_seen, MS(FRESH_MS));- /* A ringing child holds DT low with CK high. */- int rang = child && is_link(s) && !funDigitalRead(buses[s].sda) && funDigitalRead(buses[s].scl);+ /* A ringing child holds DT low with CK high. So does a Keybit turned+ * the wrong way round (its GND on our DT, its 3V3 on our CK), but that+ * side never completes a frame, so it never counts as a link. Never+ * probe it: CK low there shorts the neighbour's rail through our pin,+ * or pushes current into its SCL clamp diode if it's only fed from us. */+ int held = !funDigitalRead(buses[s].sda) && funDigitalRead(buses[s].scl);+ if (held && !is_link(s)) continue;+ int rang = held;if (!rang) {/* A peer at the same depth or shallower isn't our child; look again* now and then in case that changed. */