diff --git a/README.md b/README.md index 7d41f0c..bae439c 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Possible choices : |------------|----------|------|----------|-------------|--------------|---------| ||PB_20|I/O|**UART0_RX**/PWM1/UART1_CTS/I²C_SCL|U/D|**USB/Serial TX flash pin**|| ||PB_19|I/O|**UART0_TX**/PWM0/UART1_RTS/**I²C_SDA**|U/D|**USB/Serial RX flash pin** and **BMA456, Touch Panel, HMC5883L and BMP280 SDA pins**|| -||WAKEUP|I|**External Wake Up Pin**|D|**BMA456 IRQ line** and **Touch Panel IRQ line**|The chip is waken up when the pin is HIGH| +||WAKEUP|I|**External Wake Up Pin**|D|**BMA456 IRQ line** and **Touch Panel IRQ line** through NAND Gate|The chip is waken up when the pin is HIGH| ||RESET|I|Reset Pin|D|**Micro switch** and **USB/Serial RTS pin**|| ||XTAL_OUT|O|External crystal output|||| ||XTAL_IN|I|External crystal input|||| @@ -63,16 +63,16 @@ Possible choices : ||AVDD3V3|P|Chip power supply, 3.3V||| ||AVDD3V3_AUX|P|Chip power supply, 3.3V|||| ||TEST|I|Test function configuration pin|||| -||BOOTMODE|I/O|BOOTMODE and I²S_MCLK/LSPI_CS/PWM2/I²S_DO|U/D||| +||BOOTMODE|**I/O**|BOOTMODE and I²S_MCLK/LSPI_CS/PWM2/I²S_DO|U/D|**Touch Panel Reset line**|| ||PA_1|I/O|JTAG_CK/**I²C_SCL**/PWM3/I²S_LRCK/ADC0|U/D|**BMA456, Touch Panel, HMC5883L and BMP280 SCL pins**|| ||PA_4|I/O|JTAG_SWO/I²C_SDA/PWM4/I²S_BCK/**ADC1**|U/D|**Battery resistor voltage divider output**|| ||PA_7|I/O|**PWM4**/LSPI_MOSI/I²S_MCK/I²S_DI/Touch0|U/D|**LCD backlight N-MOSFET driver**|| ||VDD3V3IO|P|IO power supply, 3.3V|||| -||PB_0|I/O|PWM0/LSPI_MISO/UART3_TX/PSRAM_CK/Touch3|U/D||| +||PB_0|I/O|**PWM0**/LSPI_MISO/UART3_TX/PSRAM_CK/Touch3|U/D|**Vibration motor control pin**|| ||PB_1|**I/O**|PWM1/LSPI_CK/UART3_RX/PSRAM_CS/Touch4|U/D|**Touch Panel IRQ line**|| ||PB_2|I/O|PWM2/LSPI_CK/**UART2_TX**/PSRAM_D0/Touch5|U/D|**Debug UART serial output**|| -||PB_3|I/O|**PWM3**/LSPI_MISO/UART2_RX/PSRAM_D1/Touch6|U/D|**Vibration motor control pin** || -||PB_4|I/O|LSPI_CS/UART2_RTS/UART4_TX/PSRAM_D2/Touch7|U/D||| +||PB_3|**I/O**|PWM3/LSPI_MISO/UART2_RX/PSRAM_D1/Touch6|U/D|**TP4056A Charging Signal**|| +||PB_4|**I/O**|LSPI_CS/UART2_RTS/UART4_TX/PSRAM_D2/Touch7|U/D|**TP4056A Charged Signal**|| ||PB_5|**I/O**|LSPI_MOSI/UART2_CTS/UART4_RX/PSRAM_D3/Touch8|U/D|**Battery resistor voltage divider enable**|| ||VDD3V3IO|P|IO power supply, 3.3V|||| ||CAP|I|External capacitor, 4.7µF|||| @@ -82,7 +82,7 @@ Possible choices : ||PB_9|**I/O**|I²S_LRCK/MMC_D1/HSPI_CS/SDIO_D1/Touch12|U/D|**LCD Reset Pin**|| ||PB_10|**I/O**|I²S_DI/MMC_D2/HSPI_DI/SDIO_D2|U/D|**LCD Chip Select Pin**|| ||VDD3V3IO|P|IO power supply, 3.3V|||| -||PB_11|I/O|I²S_DO/MMC_D3/HSPI_DO/SDIO_D3|U/D||| +||PB_11|**I/O**|I²S_DO/MMC_D3/HSPI_DO/SDIO_D3|U/D|**BMA456 IRQ 2 line**|| ||GND|P|Ground (Central Pad)|||| ## What is done/working so far : @@ -126,6 +126,7 @@ Possible choices : (Need to work on sleep current :-( ) | Mode | Current draw | Estimated battery life (450 mAh lipo) | |--------------------------|--------------|---------------------------------------| -|Active (No BLE / No WiFi) |~52 mA | ~8 hour | +|Active (40Mhz clk)
(No BLE / No WiFi) |~52 mA | ~8 hour | +|Active (240Mhz clk)
(No BLE / No WiFi) |~72 mA | ~6 hour | |Sleep |~4.5 mA | ~4 days and 4 hours | |Standby |TODO |TODO | diff --git a/design/Kicad/W800_Smart_Watch/W800_Smart_Watch.kicad_sch b/design/Kicad/W800_Smart_Watch/W800_Smart_Watch.kicad_sch index 3a2c4a3..513a117 100644 --- a/design/Kicad/W800_Smart_Watch/W800_Smart_Watch.kicad_sch +++ b/design/Kicad/W800_Smart_Watch/W800_Smart_Watch.kicad_sch @@ -2298,7 +2298,7 @@ (junction (at 260.35 39.37) (diameter 0) (color 0 0 0 0) (uuid 0f8d6239-fd5f-4c86-aced-00b76465cf70) ) - (junction (at 140.97 33.02) (diameter 0) (color 0 0 0 0) + (junction (at 143.51 38.1) (diameter 0) (color 0 0 0 0) (uuid 1129f15d-98d3-4ca0-9ce9-0a6ff07f2696) ) (junction (at 52.07 167.64) (diameter 0) (color 0 0 0 0) @@ -2313,6 +2313,15 @@ (junction (at 86.36 110.49) (diameter 0) (color 0 0 0 0) (uuid 23942015-e36b-4921-b191-73cbad05cb0f) ) + (junction (at 154.94 110.49) (diameter 0) (color 0 0 0 0) + (uuid 2757ab05-604e-4af9-8881-4b28c3ff200b) + ) + (junction (at 133.35 114.3) (diameter 0) (color 0 0 0 0) + (uuid 2964eec8-65de-4165-815b-35bec3e3b3d0) + ) + (junction (at 114.3 19.05) (diameter 0) (color 0 0 0 0) + (uuid 2c9667b1-d3bd-4bfd-ac49-18339fe9686a) + ) (junction (at 24.13 167.64) (diameter 0) (color 0 0 0 0) (uuid 32838faf-eb2a-42a6-aa8f-3fa293871dd7) ) @@ -2322,6 +2331,9 @@ (junction (at 195.58 95.25) (diameter 0) (color 0 0 0 0) (uuid 3f9f7d6c-2813-4878-bfd5-05fa46771ea8) ) + (junction (at 69.85 187.96) (diameter 0) (color 0 0 0 0) + (uuid 42b57740-215f-49dd-b686-44c128169584) + ) (junction (at 149.86 125.73) (diameter 0) (color 0 0 0 0) (uuid 46bb2823-0aaa-4d23-bf91-adfde47dae92) ) @@ -2406,9 +2418,6 @@ (junction (at 52.07 30.48) (diameter 0) (color 0 0 0 0) (uuid 964a8c0f-3152-4a31-80c1-58eddf33f523) ) - (junction (at 78.74 187.96) (diameter 0) (color 0 0 0 0) - (uuid 96a7c748-5110-4787-b728-4d06081335a2) - ) (junction (at 267.97 20.32) (diameter 0) (color 0 0 0 0) (uuid 9718036f-f1d2-4b12-be9e-9741664c7bde) ) @@ -2448,7 +2457,7 @@ (junction (at 38.1 110.49) (diameter 0) (color 0 0 0 0) (uuid c582ee6a-d412-4ea8-8ddb-37338fa9ee12) ) - (junction (at 133.35 25.4) (diameter 0) (color 0 0 0 0) + (junction (at 135.89 30.48) (diameter 0) (color 0 0 0 0) (uuid c96fe79d-473a-4661-b95b-961f046859e3) ) (junction (at 207.01 92.71) (diameter 0) (color 0 0 0 0) @@ -2478,6 +2487,9 @@ (junction (at 48.26 177.8) (diameter 0) (color 0 0 0 0) (uuid d8d49caf-e7ee-4597-b2c5-8d3ac0ff53b7) ) + (junction (at 106.68 22.86) (diameter 0) (color 0 0 0 0) + (uuid d9e383c8-40f1-47ff-8d92-1c3853b7f12b) + ) (junction (at 140.97 186.69) (diameter 0) (color 0 0 0 0) (uuid da53dfee-e1e5-4f3f-ada0-92a1c0c36808) ) @@ -2496,6 +2508,9 @@ (junction (at 119.38 77.47) (diameter 0) (color 0 0 0 0) (uuid ec191602-7290-4877-ab99-eeb0ffed3ef1) ) + (junction (at 143.51 102.87) (diameter 0) (color 0 0 0 0) + (uuid ee54b237-c063-49e5-9994-9849bebf18ac) + ) (junction (at 30.48 83.82) (diameter 0) (color 0 0 0 0) (uuid ee884255-8b8f-4c4a-be05-110840788bc5) ) @@ -2524,16 +2539,12 @@ (uuid fe357f49-c068-4c83-ba59-359070228de0) ) - (no_connect (at 243.84 76.2) (uuid 0aabd6fb-fc34-4915-bdcd-60e11ea9a17c)) - (no_connect (at 270.51 91.44) (uuid 117968a8-01cb-4e17-ae9b-4a538918dc31)) - (no_connect (at 142.24 139.7) (uuid 30da4fcd-8df8-4a6c-8402-39bfb7d81dd5)) (no_connect (at 78.74 66.04) (uuid 45e31b4f-c555-44a2-abc4-92352b5a0bb9)) (no_connect (at 63.5 66.04) (uuid 6693da88-586e-460b-aa60-df226056cc5a)) (no_connect (at 138.43 49.53) (uuid 833723a8-e8d8-4f3f-84f0-68d93276c03a)) (no_connect (at 78.74 53.34) (uuid 9cd32427-126c-40b6-bac0-0168065a2a60)) (no_connect (at 30.48 130.81) (uuid c6effa0d-b15f-4f7a-a19c-96552a92de4b)) (no_connect (at 119.38 146.05) (uuid c7539b91-aaa2-4ee3-b9de-34aa341b40b9)) - (no_connect (at 270.51 101.6) (uuid cfc487fd-8f69-4cf8-9dd8-a0d33e320303)) (no_connect (at 119.38 143.51) (uuid dc69a83f-5c89-4ab0-aa91-183a70c49e76)) (wire (pts (xy 80.01 33.02) (xy 82.55 33.02)) @@ -2548,6 +2559,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 01a132e2-ffff-4501-a42b-c424546628a7) ) + (wire (pts (xy 276.86 101.6) (xy 276.86 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 01e8d75e-95c9-4cc9-8f43-084d84b7ae15) + ) (wire (pts (xy 170.18 60.96) (xy 170.18 80.01)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 028d08ee-558f-4701-a5bc-43e09ce022b8) @@ -2564,6 +2579,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 03f5df1e-5387-49a1-bd79-b8759455152e) ) + (wire (pts (xy 78.74 187.96) (xy 81.28 187.96)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 040d54b1-91ca-4299-9154-95f4cfb5e44c) + ) (wire (pts (xy 58.42 120.65) (xy 60.96 120.65)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 04190abb-8f34-40f3-af31-2f1f1b4c65ac) @@ -2636,6 +2655,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 12a7c44a-e781-4bea-bea4-9f2f90d1a268) ) + (wire (pts (xy 280.67 101.6) (xy 280.67 99.06)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 12c97968-f93f-4672-bdc7-dd9b329ad40d) + ) (wire (pts (xy 245.11 24.13) (xy 245.11 26.67)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 13f885d3-f857-49e9-9051-4fdbb07ba79e) @@ -2652,6 +2675,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 14ea1073-d49b-499d-aaf7-bd1ed11f0d1c) ) + (wire (pts (xy 133.35 102.87) (xy 143.51 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 153698e7-2538-4876-87f8-869048315ec5) + ) (wire (pts (xy 132.08 125.73) (xy 142.24 125.73)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 157b8ecc-48df-4264-b51d-1f27cd825543) @@ -2672,6 +2699,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1913991a-03fd-440d-a621-703216444872) ) + (wire (pts (xy 143.51 102.87) (xy 154.94 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 1a2ae326-4989-448e-871b-4bc96c13c076) + ) (wire (pts (xy 38.1 110.49) (xy 39.37 110.49)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1ae2b48e-7068-40fd-9fcf-0ae6029cf8dc) @@ -2688,7 +2719,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1d54cbad-a491-4655-8cdb-9ce98b619d67) ) - (wire (pts (xy 133.35 33.02) (xy 140.97 33.02)) + (wire (pts (xy 135.89 38.1) (xy 143.51 38.1)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1f699f83-16a6-4f3c-a38d-8744f3febac4) ) @@ -2708,6 +2739,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 20ec31b4-2632-4bd5-aa74-61d5cf3b4cf5) ) + (wire (pts (xy 270.51 101.6) (xy 276.86 101.6)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 20ee4e80-edd1-4ba8-bf27-8c9f54d57d2e) + ) (wire (pts (xy 246.38 116.84) (xy 246.38 123.19)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 21e06298-efa2-4cf8-be37-47708e7a9e63) @@ -2784,6 +2819,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 305cddfb-c15e-4b88-b49b-763d0abaed87) ) + (wire (pts (xy 109.22 15.24) (xy 106.68 15.24)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 31b87593-5474-4c6b-a412-737c91dd393e) + ) (wire (pts (xy 96.52 50.8) (xy 97.79 50.8)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 32979b57-9ae1-4136-ba63-77a628c275be) @@ -2852,6 +2891,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 40afeb37-aa69-4c3a-8ad6-f8f8f667ef61) ) + (wire (pts (xy 280.67 99.06) (xy 278.13 99.06)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 4124315b-40c4-437c-aeac-f2866398b5a5) + ) (wire (pts (xy 99.06 69.85) (xy 99.06 68.58)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4198b629-afd1-441c-9280-e187f5fc09c8) @@ -2868,6 +2911,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 45fe9e82-ca3c-4eeb-b700-1b077303f2c0) ) + (wire (pts (xy 114.3 19.05) (xy 109.22 19.05)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 4639dd7c-9d8c-4567-80ed-70556ffab3ed) + ) (wire (pts (xy 78.74 48.26) (xy 81.28 48.26)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4760011b-7f2c-4269-994b-c8461df88eb1) @@ -2880,7 +2927,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4a9de559-ed11-43a2-9f05-147023c06806) ) - (wire (pts (xy 100.33 22.86) (xy 101.6 22.86)) + (wire (pts (xy 105.41 25.4) (xy 106.68 25.4)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4ae5f94d-5b96-4eaf-a473-67c1515599e4) ) @@ -2896,6 +2943,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4f1d8121-43a6-4a6d-861d-844356c0f753) ) + (wire (pts (xy 153.67 110.49) (xy 154.94 110.49)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 50393778-d689-432a-9c0b-7b4b39ecaf65) + ) (wire (pts (xy 270.51 110.49) (xy 270.51 111.76)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 51c839c6-b6f4-4bb4-863d-d5841cdc9201) @@ -2916,6 +2967,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5404187f-6f74-40d8-b08b-27677cb6104b) ) + (wire (pts (xy 114.3 19.05) (xy 114.3 21.59)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 5537a9d3-f3c2-4af6-901d-d05ef8c68112) + ) (wire (pts (xy 78.74 63.5) (xy 83.82 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 55ec12aa-fa22-4007-9359-801f74185eb3) @@ -2932,6 +2987,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 57f6658c-9f9a-4e0c-a20e-fade289a0aee) ) + (wire (pts (xy 69.85 187.96) (xy 71.12 187.96)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 59695af4-af6a-48ef-84b8-66940c34467b) + ) (wire (pts (xy 39.37 177.8) (xy 39.37 180.34)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5a3289c2-4aeb-4583-842a-4dc156dd1270) @@ -2944,6 +3003,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5fa7d047-31d4-4fa2-8eb2-108cfb94aa8d) ) + (wire (pts (xy 130.81 114.3) (xy 133.35 114.3)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 60fad88c-f165-4a6b-aa40-8c32c6a6e5e4) + ) (wire (pts (xy 241.3 130.81) (xy 246.38 130.81)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 62fd77bf-2a6a-43c0-8a02-a2c3f33c5f8c) @@ -3016,7 +3079,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7173882b-d592-4c47-bab7-355d5a3b9743) ) - (wire (pts (xy 109.22 24.13) (xy 109.22 26.67)) + (wire (pts (xy 114.3 26.67) (xy 114.3 29.21)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 71837367-8e26-44fd-8312-239d7bec2c8d) ) @@ -3044,10 +3107,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 79e69d38-1d6a-42f8-940c-3298ca68daa6) ) - (wire (pts (xy 140.97 19.05) (xy 140.97 20.32)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 79f59254-2813-4cfa-a3bb-b7018b3e714a) - ) (wire (pts (xy 207.01 102.87) (xy 200.66 102.87)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7a49cf91-2de4-4fe5-a213-fc435f3c8855) @@ -3064,6 +3123,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7f4ea961-8a89-4f81-b3bd-fa31e50c8c52) ) + (wire (pts (xy 133.35 114.3) (xy 135.89 114.3)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 7fd21b96-00b6-40b8-97a9-e41a564e5fa7) + ) (wire (pts (xy 54.61 80.01) (xy 57.15 80.01)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 804b6285-da14-4a5f-a12e-c6581c1c4bb5) @@ -3072,6 +3135,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 8074b74c-2f83-45d1-bfef-248340873a54) ) + (wire (pts (xy 144.78 15.24) (xy 143.51 15.24)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 81890082-3901-459e-88a7-fbaa8d711b5e) + ) (wire (pts (xy 58.42 63.5) (xy 63.5 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 81fe4113-7e7e-41a5-8909-19a450ad37dc) @@ -3116,7 +3183,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 8dc4c651-81aa-4838-a853-a5ca26cf7281) ) - (wire (pts (xy 128.27 33.02) (xy 129.54 33.02)) + (wire (pts (xy 130.81 38.1) (xy 132.08 38.1)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 8e2184b6-d66d-4ee3-83e4-6e414ad10d41) ) @@ -3136,6 +3203,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 906a851e-e4d9-4ce2-992d-5be9f2a0db50) ) + (wire (pts (xy 142.24 139.7) (xy 142.24 140.97)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 91289220-ccd9-4a39-9a15-cb13390a39aa) + ) (wire (pts (xy 60.96 35.56) (xy 60.96 39.37)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 91603439-fe62-4769-8031-916a27af1576) @@ -3220,6 +3291,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a5a52420-d6bc-40de-ba5c-c41a65f768c1) ) + (wire (pts (xy 109.22 19.05) (xy 109.22 15.24)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid a5daba79-c240-44b6-a56f-f7c218d4c1fc) + ) (wire (pts (xy 80.01 30.48) (xy 82.55 30.48)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a650ef1e-bd1f-42f4-a616-004e6cad08a2) @@ -3250,7 +3325,7 @@ ) (wire (pts (xy 236.22 123.19) (xy 241.3 123.19)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid ae2099cd-3a64-4c50-b364-6cb02650117c) + (uuid b8f540d0-3ca5-4e22-aa95-94860aaa8c42) ) (wire (pts (xy 119.38 63.5) (xy 119.38 68.58)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3258,7 +3333,7 @@ ) (wire (pts (xy 200.66 20.32) (xy 200.66 22.86)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid ae544e42-41ba-47a8-8991-cb766291e2c0) + (uuid b9636b90-d89b-4f67-928b-ff7f775067d6) ) (wire (pts (xy 242.57 29.21) (xy 247.65 29.21)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3268,13 +3343,13 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid af4b3cac-9b6e-4f53-8669-df40d3be23bc) ) - (wire (pts (xy 109.22 17.78) (xy 109.22 19.05)) + (wire (pts (xy 114.3 17.78) (xy 114.3 19.05)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid afd4e2c7-e9c6-493d-beba-dc7fe9dfd93e) + (uuid bd08bdc1-6fbc-4910-b9dc-618ef620f7ca) ) (wire (pts (xy 270.51 104.14) (xy 274.32 104.14)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid afe840dd-6e7e-4231-be2a-79134b64a66e) + (uuid be06ff11-335e-431e-ba4d-216e84e92077) ) (wire (pts (xy 135.89 46.99) (xy 135.89 49.53)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3282,13 +3357,13 @@ ) (wire (pts (xy 118.11 187.96) (xy 120.65 187.96)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b15e495b-c8cc-40c4-b1f3-b9a9dd2993d7) + (uuid bee8e0fb-0d50-477e-8dc0-474e533062b4) ) - (wire (pts (xy 78.74 68.58) (xy 82.55 68.58)) + (wire (pts (xy 93.98 115.57) (xy 93.98 118.11)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b217d1a6-04b5-4791-9ef8-d821b757d9a4) + (uuid c0695b35-7459-4b33-ae6d-57a59535292c) ) - (wire (pts (xy 129.54 25.4) (xy 133.35 25.4)) + (wire (pts (xy 132.08 30.48) (xy 135.89 30.48)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b3eae4db-6c0a-495e-b1f5-5cb69df43ba1) ) @@ -3298,15 +3373,15 @@ ) (wire (pts (xy 26.67 110.49) (xy 38.1 110.49)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b677207f-989e-4524-a08b-268c97bc086e) + (uuid c07a5a73-9443-41aa-bdfd-bd0a6aa74639) ) (wire (pts (xy 274.32 104.14) (xy 274.32 111.76)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b8f540d0-3ca5-4e22-aa95-94860aaa8c42) + (uuid c4112ee9-ce55-445a-8353-0898338a3805) ) - (wire (pts (xy 30.48 26.67) (xy 38.1 26.67)) + (wire (pts (xy 257.81 21.59) (xy 259.08 21.59)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b9636b90-d89b-4f67-928b-ff7f775067d6) + (uuid c41884ea-a9ab-4c4b-8f29-8a2a15160059) ) (wire (pts (xy 242.57 16.51) (xy 245.11 16.51)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3318,11 +3393,7 @@ ) (wire (pts (xy 209.55 95.25) (xy 205.74 95.25)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid bd08bdc1-6fbc-4910-b9dc-618ef620f7ca) - ) - (wire (pts (xy 142.24 19.05) (xy 140.97 19.05)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid be06ff11-335e-431e-ba4d-216e84e92077) + (uuid c7d436ad-fa13-4a15-a6d7-baff731fef17) ) (wire (pts (xy 163.83 63.5) (xy 166.37 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3344,6 +3415,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c41884ea-a9ab-4c4b-8f29-8a2a15160059) ) + (wire (pts (xy 143.51 15.24) (xy 143.51 17.78)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid c79bb427-9181-4566-9ebc-7d1f51dd188b) + ) (wire (pts (xy 144.78 138.43) (xy 142.24 138.43)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c7d436ad-fa13-4a15-a6d7-baff731fef17) @@ -3368,6 +3443,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ca832bc7-ea19-45fd-8bbe-24e91bb2e6c5) ) + (wire (pts (xy 143.51 100.33) (xy 143.51 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid cafbf5b3-438a-4b1d-ac5c-3002af89a1dd) + ) (wire (pts (xy 151.13 179.07) (xy 151.13 186.69)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid cb27ca9e-4e0c-4ca7-9243-b67f55ab55e5) @@ -3380,6 +3459,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid cc8bf306-857b-4e66-ab7f-5b7b9285aaaa) ) + (wire (pts (xy 133.35 106.68) (xy 133.35 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid ccbc45cd-b53f-4358-a032-1a3937272f8d) + ) (wire (pts (xy 24.13 167.64) (xy 31.75 167.64)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ccc719a5-e2be-4d3b-9719-9f653cec5897) @@ -3388,6 +3471,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid cd423102-7ddd-4af6-96b2-b58124e5d1d1) ) + (wire (pts (xy 154.94 110.49) (xy 157.48 110.49)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid cdfa86bb-f5bb-4bde-b356-0125a3d994f6) + ) (wire (pts (xy 205.74 95.25) (xy 205.74 97.79)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ce4f5674-5d1f-49fc-8903-80f258d07511) @@ -3424,9 +3511,13 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d456edec-8cce-4efc-a7ae-1a069e1ebb7b) ) - (wire (pts (xy 76.2 187.96) (xy 78.74 187.96)) + (wire (pts (xy 137.16 179.07) (xy 140.97 179.07)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid d56bce4e-8103-4d4e-8de5-d66476a75383) + (uuid d6db186a-fd59-4491-b79c-925569e67cac) + ) + (wire (pts (xy 209.55 129.54) (xy 213.36 129.54)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid d8cd6817-ca01-4fc2-bac0-aad6fe6b90f0) ) (wire (pts (xy 137.16 179.07) (xy 140.97 179.07)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3476,7 +3567,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid de7b81dd-1c7d-49a0-bf48-477fa2285cb3) ) - (wire (pts (xy 140.97 30.48) (xy 140.97 33.02)) + (wire (pts (xy 143.51 35.56) (xy 143.51 38.1)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid decaa767-8d49-4729-9db6-11c97c4a5b7f) ) @@ -3488,9 +3579,13 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid dfe930fa-6f38-4330-bda8-981a514f1ef0) ) - (wire (pts (xy 78.74 187.96) (xy 81.28 187.96)) + (wire (pts (xy 109.22 143.51) (xy 111.76 143.51)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid e411a7b6-df4e-455d-8456-a0144b82a869) + (uuid e4c50895-e5ad-4f1b-b264-7547d92ddc79) + ) + (wire (pts (xy 119.38 123.19) (xy 132.08 123.19)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid e4d3b540-e094-4d79-9ae7-dd0cefa313ee) ) (wire (pts (xy 109.22 143.51) (xy 111.76 143.51)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -3512,7 +3607,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e56f7a38-9176-414e-8ae2-1aa654190310) ) - (wire (pts (xy 66.04 187.96) (xy 68.58 187.96)) + (wire (pts (xy 66.04 187.96) (xy 69.85 187.96)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e5831c2f-3b2b-4288-a42a-b962a3d63cdf) ) @@ -3576,7 +3671,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ed0ac167-234a-4b82-a117-cf79d37196c0) ) - (wire (pts (xy 100.33 20.32) (xy 101.6 20.32)) + (wire (pts (xy 105.41 22.86) (xy 106.68 22.86)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid edafb2dd-37b9-47aa-99b5-81bcbac125ec) ) @@ -3588,6 +3683,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f1835d5f-9fd6-4328-b081-85bc06eae84b) ) + (wire (pts (xy 142.24 140.97) (xy 144.78 140.97)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid f418fd63-0cc3-4e44-887e-c260a55f97e3) + ) (wire (pts (xy 97.79 35.56) (xy 97.79 50.8)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f46e0900-53b2-41ef-b431-ef7281315796) @@ -3629,10 +3728,17 @@ (uuid ffa94c43-0c92-4715-b5ac-d13202b41afc) ) - (global_label "LCD_LED_K" (shape input) (at 142.24 19.05 0) (fields_autoplaced) + (global_label "W800_PB0" (shape input) (at 276.86 102.87 270) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid 00fe085f-fc6f-4f95-9c28-9b5079d54a6a) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 276.7806 115.0802 90) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "LCD_LED_K" (shape input) (at 144.78 15.24 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid 013cae6b-d129-45b0-a8a6-0144a5fb734a) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 154.8736 19.1294 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 157.4136 15.3194 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) @@ -3657,6 +3763,13 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) + (global_label "W800_PB11" (shape input) (at 243.84 76.2 90) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid 0d47a737-3237-4f21-8121-2e5ba359734a) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 243.7606 62.7802 90) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "LCD_CLK" (shape input) (at 259.08 76.2 90) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid 0df44bc4-e98e-446c-bd74-9afe8fb8d413) @@ -3664,6 +3777,13 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) + (global_label "W800_PB11" (shape input) (at 152.4 140.97 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid 11b2f31a-747d-4bab-996b-a51701a685cb) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 165.8198 140.8906 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "W800_SCL" (shape input) (at 124.46 60.96 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 1742355d-2fbe-4b24-abb0-7f8fbfaf0f6e) @@ -3671,10 +3791,17 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "~{TP_INT}" (shape input) (at 100.33 22.86 180) (fields_autoplaced) + (global_label "~{CHARGED_SIG}" (shape input) (at 153.67 110.49 180) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid 174dd0a9-158e-4887-951b-ce45501457c1) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 138.5569 110.5694 0) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "~{TP_INT}" (shape input) (at 105.41 22.86 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 1b40e189-ba86-4df1-bd84-00d4e9562bf0) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 91.8088 22.7806 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 96.8888 22.7806 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -3706,10 +3833,10 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) - (global_label "W800_PB3" (shape input) (at 77.47 110.49 180) (fields_autoplaced) + (global_label "W800_PB0" (shape input) (at 77.47 110.49 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 37604e24-e927-4e8d-89ce-c9b38a8c0ee9) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 65.2598 110.5694 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 65.2598 110.4106 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -3720,6 +3847,13 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) + (global_label "W800_PB3" (shape input) (at 143.51 114.3 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid 393d8116-a5cd-4c9e-b811-599add945686) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.7202 114.2206 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "LCD_D{slash}C" (shape input) (at 170.18 25.4 270) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 3e4d1aa2-5466-4f1f-869d-193538fe0aa6) @@ -3734,10 +3868,10 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) - (global_label "W800_WAKEUP" (shape input) (at 115.57 21.59 0) (fields_autoplaced) + (global_label "W800_WAKEUP" (shape input) (at 120.65 24.13 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid 44b54c3d-e7ea-4ea3-a9a1-9e18a4c469d2) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 131.5902 21.6694 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 136.6702 24.2094 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) ) @@ -3762,13 +3896,6 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "~{BMA_INT1}" (shape input) (at 144.78 138.43 0) (fields_autoplaced) - (effects (font (size 1.27 1.27)) (justify left)) - (uuid 607c87d9-0957-4f65-8496-a1bab0ff2d25) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 156.0831 138.5094 0) - (effects (font (size 1.27 1.27)) (justify left) hide) - ) - ) (global_label "LCD_RST" (shape input) (at 251.46 76.2 90) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid 66faa350-7810-42ec-8ec9-142581121dad) @@ -3776,6 +3903,13 @@ (effects (font (size 1.27 1.27)) (justify left) hide) ) ) + (global_label "W800_PB4" (shape input) (at 165.1 110.49 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid 673645fb-b59d-4949-aa59-d20afdee2a9d) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 177.3102 110.4106 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "W800_TXD_SDA" (shape input) (at 133.35 46.99 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 686c394e-3901-48a4-9efb-5ecf17b3e153) @@ -3860,11 +3994,18 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "~{TP_INT}" (shape input) (at 270.51 99.06 0) (fields_autoplaced) - (effects (font (size 1.27 1.27)) (justify left)) + (global_label "~{TP_INT}" (shape input) (at 280.67 101.6 270) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) (uuid 8d2c9c57-4ac9-42c4-bba7-d840a76efcb2) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 279.0312 99.1394 0) - (effects (font (size 1.27 1.27)) (justify left) hide) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 280.5906 110.1212 90) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "~{CHARGING_SIG}" (shape input) (at 130.81 114.3 180) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid 93e340f8-a888-44de-a759-f63768547e79) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 114.9107 114.3794 0) + (effects (font (size 1.27 1.27)) (justify right) hide) ) ) (global_label "LCD_CS" (shape input) (at 248.92 76.2 90) (fields_autoplaced) @@ -3881,6 +4022,20 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) + (global_label "~{W800_BOOTMODE}" (shape input) (at 187.96 25.4 270) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid 9ff4fab2-8679-4374-b0d7-206d9153b056) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 188.0394 43.9602 90) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "~{BMA_INT1}" (shape input) (at 144.78 138.43 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid a0945807-c704-42b8-b2f6-31c2586a3812) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 156.0831 138.5094 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "W800_RXD" (shape input) (at 60.96 118.11 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid a285c6b1-b84a-4e8c-9837-04acd5dad02a) @@ -3958,13 +4113,6 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "TP_RST" (shape input) (at 187.96 25.4 270) (fields_autoplaced) - (effects (font (size 1.27 1.27)) (justify right)) - (uuid b8f42566-d7f6-4720-bdb9-b69f4e6a011a) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 187.8806 34.4655 90) - (effects (font (size 1.27 1.27)) (justify right) hide) - ) - ) (global_label "W800_WAKEUP" (shape input) (at 231.14 91.44 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid ba35900c-596b-415f-83ee-e763840658cd) @@ -3979,6 +4127,27 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) + (global_label "~{BMA_INT1}" (shape input) (at 105.41 25.4 180) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid c735cf32-0ead-4589-97ef-6601e36aa493) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 94.1069 25.3206 0) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "W800_PA4" (shape input) (at 259.08 114.3 270) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid cfb5b5ab-f820-4bbb-908f-710953ceb06d) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 259.0006 126.3288 90) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) + (global_label "W800_PA7" (shape input) (at 130.81 38.1 180) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify right)) + (uuid cfc6df19-c8b2-4d68-b7d0-eed410dd4274) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 118.7812 38.0206 0) + (effects (font (size 1.27 1.27)) (justify right) hide) + ) + ) (global_label "~{BMA_INT1}" (shape input) (at 100.33 20.32 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid c735cf32-0ead-4589-97ef-6601e36aa493) @@ -4007,6 +4176,13 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) + (global_label "W800_PB4" (shape input) (at 270.51 91.44 0) (fields_autoplaced) + (effects (font (size 1.27 1.27)) (justify left)) + (uuid e5277cdd-d28f-47b6-ab30-8f4e4a2e53d0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 282.7202 91.3606 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + ) (global_label "~{W800_RST}" (shape input) (at 60.96 138.43 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left)) (uuid ed2e3f0d-f6aa-4988-9116-dd555b4f9df8) @@ -4086,17 +4262,17 @@ (pin "2" (uuid cd3cc54b-34a2-4d2a-b3f7-cf7a626fa0e4)) ) - (symbol (lib_id "power:+3.3V") (at 78.74 180.34 0) (unit 1) + (symbol (lib_id "power:+3.3V") (at 69.85 180.34 0) (unit 1) (in_bom yes) (on_board yes) (uuid 093861e2-eca0-441c-9332-c290bbba9619) - (property "Reference" "#PWR021" (id 0) (at 78.74 184.15 0) + (property "Reference" "#PWR021" (id 0) (at 69.85 184.15 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3.3V" (id 1) (at 78.74 176.53 0)) - (property "Footprint" "" (id 2) (at 78.74 180.34 0) + (property "Value" "+3.3V" (id 1) (at 69.85 175.26 0)) + (property "Footprint" "" (id 2) (at 69.85 180.34 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 78.74 180.34 0) + (property "Datasheet" "" (id 3) (at 69.85 180.34 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 3077e333-f7bb-4d21-bff1-78ba3fcf1311)) @@ -4132,23 +4308,22 @@ (property "Datasheet" "~" (id 3) (at 246.38 127 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid 779423ff-94f1-4075-8e12-10a18102af4d)) - (pin "2" (uuid 4c328e91-6508-4eb3-a7ee-5080091698fb)) + (pin "1" (uuid 28cdb7e4-18b8-4e13-b20c-8017670585e9)) ) - (symbol (lib_id "Device:R") (at 133.35 29.21 0) (unit 1) + (symbol (lib_id "Device:R") (at 135.89 34.29 0) (unit 1) (in_bom yes) (on_board yes) (uuid 0ae81642-6c9f-4f05-ab0c-4fdd7fd79b27) - (property "Reference" "R19" (id 0) (at 135.89 27.9399 0) + (property "Reference" "R19" (id 0) (at 138.43 33.0199 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "100K" (id 1) (at 133.35 31.75 90) + (property "Value" "100K" (id 1) (at 135.89 36.83 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 131.572 29.21 90) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 134.112 34.29 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 133.35 29.21 0) + (property "Datasheet" "~" (id 3) (at 135.89 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 67337a09-0f65-428f-9d4d-e1e0c10212b5)) @@ -4277,13 +4452,32 @@ (pin "8" (uuid c4534f02-b70d-4fbd-ad4a-554072947680)) ) + (symbol (lib_id "Device:R") (at 154.94 106.68 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 11c56f8c-eb66-4d33-bce2-7874fbc60b32) + (property "Reference" "R33" (id 0) (at 152.4 105.41 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "47K" (id 1) (at 154.94 105.41 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 156.718 106.68 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 154.94 106.68 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid eb1dd6c8-e763-4c29-a65b-c9dff445765f)) + (pin "2" (uuid 87a5167f-6e68-41bd-9728-87168702cb41)) + ) + (symbol (lib_id "power:+3.3V") (at 143.51 48.26 0) (unit 1) (in_bom yes) (on_board yes) (uuid 13d0e2f3-71f6-46d8-a439-b27a51f3cd08) (property "Reference" "#PWR042" (id 0) (at 143.51 52.07 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3.3V" (id 1) (at 142.24 44.45 0)) + (property "Value" "+3.3V" (id 1) (at 147.32 48.26 0)) (property "Footprint" "" (id 2) (at 143.51 48.26 0) (effects (font (size 1.27 1.27)) hide) ) @@ -4407,6 +4601,25 @@ (pin "1" (uuid 0bea5ecb-46f1-42ac-a126-16559ee48289)) ) + (symbol (lib_id "Device:R") (at 161.29 110.49 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid 1aaae979-230e-43c2-a208-e1b93c0eabb6) + (property "Reference" "R35" (id 0) (at 160.02 113.03 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1K" (id 1) (at 160.02 110.49 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 161.29 108.712 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 161.29 110.49 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid e8ceedc4-dca6-49e7-b9ad-f8b0fbf1c896)) + (pin "2" (uuid d8789c77-0e0b-43c1-bd53-6f89156783c6)) + ) + (symbol (lib_id "ICs:IRLML6402") (at 143.51 166.37 180) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 1b1e74df-c498-4e1a-af5b-f51aeaf308ed) @@ -4474,6 +4687,25 @@ (pin "1" (uuid ef03904c-82b2-4838-9ad2-f764bcb264b6)) ) + (symbol (lib_id "Device:R") (at 139.7 114.3 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid 1f8b889a-c2d5-4a66-8124-0d99d4e36492) + (property "Reference" "R34" (id 0) (at 138.43 116.84 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1K" (id 1) (at 138.43 114.3 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 139.7 112.522 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 139.7 114.3 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 7e5c8c81-a2b7-402c-b7c9-2b41f5574cf1)) + (pin "2" (uuid 7fdf8a9b-7cdb-49d4-9226-3a9a0f9c0245)) + ) + (symbol (lib_id "Device:C") (at 20.32 173.99 0) (unit 1) (in_bom yes) (on_board yes) (uuid 2039f5ae-bf96-4dd4-8524-39dce43d83d3) @@ -4572,7 +4804,7 @@ (property "Reference" "R20" (id 0) (at 135.89 175.26 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "4.2K" (id 1) (at 140.97 177.8 90) + (property "Value" "4.7K" (id 1) (at 140.97 177.8 90) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 139.192 175.26 90) @@ -4857,7 +5089,7 @@ (property "Reference" "R23" (id 0) (at 161.29 173.9899 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "100K" (id 1) (at 158.75 177.8 90) + (property "Value" "30K" (id 1) (at 158.75 177.8 90) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 156.972 175.26 90) @@ -5044,19 +5276,19 @@ (pin "2" (uuid 14e2a0df-0d54-4f50-9ccf-c893c13b7c04)) ) - (symbol (lib_id "ICs:IRLML2502") (at 138.43 25.4 0) (unit 1) + (symbol (lib_id "ICs:IRLML2502") (at 140.97 30.48 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 4c1318e0-2bdd-4eed-a6c7-6d35e7dee079) - (property "Reference" "Q2" (id 0) (at 144.78 24.1299 0) + (property "Reference" "Q2" (id 0) (at 147.32 29.2099 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "IRLML2502" (id 1) (at 144.78 26.6699 0) + (property "Value" "IRLML2502" (id 1) (at 147.32 31.7499 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 143.51 27.305 0) + (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 146.05 32.385 0) (effects (font (size 1.27 1.27) italic) (justify left) hide) ) - (property "Datasheet" "https://www.infineon.com/dgdl/irlml2502pbf.pdf?fileId=5546d462533600a401535668048e2606" (id 3) (at 138.43 25.4 0) + (property "Datasheet" "https://www.infineon.com/dgdl/irlml2502pbf.pdf?fileId=5546d462533600a401535668048e2606" (id 3) (at 140.97 30.48 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) (pin "1" (uuid b7f7da48-275b-43cd-bced-356fbdecbaa3)) @@ -5105,7 +5337,7 @@ (property "Reference" "R22" (id 0) (at 151.13 161.2899 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "100K" (id 1) (at 148.59 165.1 90) + (property "Value" "30K" (id 1) (at 148.59 165.1 90) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 146.812 162.56 90) @@ -5198,6 +5430,25 @@ (pin "1" (uuid 8397c690-b9d5-4815-8032-d30357955bab)) ) + (symbol (lib_id "Device:R") (at 106.68 19.05 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 5e884ce3-c29a-45fc-9cba-563bb994aeb1) + (property "Reference" "R29" (id 0) (at 104.14 17.78 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "47K" (id 1) (at 106.68 17.78 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 108.458 19.05 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 106.68 19.05 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid b38ce40c-8c39-40e8-929b-d81c6debef38)) + (pin "2" (uuid 7d3639b4-9fb1-4e47-8cb1-94588c56dd08)) + ) + (symbol (lib_id "Device:C") (at 48.26 173.99 0) (unit 1) (in_bom yes) (on_board yes) (uuid 5eef771d-c7af-4d00-904f-0aaeb5b546bf) @@ -5258,14 +5509,33 @@ (property "Reference" "#PWR05" (id 0) (at 31.75 71.12 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 31.75 69.85 0)) - (property "Footprint" "" (id 2) (at 31.75 64.77 0) + (property "Value" "+3.3V" (id 1) (at 114.3 64.77 0)) + (property "Footprint" "" (id 2) (at 115.57 68.58 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 31.75 64.77 0) + (property "Datasheet" "" (id 3) (at 115.57 68.58 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid f01d4376-54be-4258-950f-58fa9dd0d17a)) + (pin "1" (uuid e07c90cd-788f-4d17-990b-41108003921d)) + ) + + (symbol (lib_id "Device:R") (at 115.57 138.43 90) (unit 1) + (in_bom yes) (on_board yes) + (uuid 652e0e73-e98b-4100-acb8-91a231934b84) + (property "Reference" "R15" (id 0) (at 116.84 140.97 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "10K" (id 1) (at 116.84 138.43 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 115.57 140.208 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 115.57 138.43 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 8b2b052c-35b9-419b-87ad-270375159ba6)) + (pin "2" (uuid e7a81aa3-3059-46a0-aaa2-5c02813029d7)) ) (symbol (lib_id "power:+3.3V") (at 115.57 68.58 0) (unit 1) @@ -5401,17 +5671,17 @@ (pin "1" (uuid c48a975c-b2c0-4136-b0f0-d0ba507c6569)) ) - (symbol (lib_id "power:GND") (at 109.22 26.67 0) (unit 1) + (symbol (lib_id "power:GND") (at 114.3 29.21 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 6c5a7bb0-43f4-4b42-bcfc-73d68d0432ce) - (property "Reference" "#PWR032" (id 0) (at 109.22 33.02 0) + (property "Reference" "#PWR032" (id 0) (at 114.3 35.56 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 109.22 31.75 0)) - (property "Footprint" "" (id 2) (at 109.22 26.67 0) + (property "Value" "GND" (id 1) (at 114.3 34.29 0)) + (property "Footprint" "" (id 2) (at 114.3 29.21 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 109.22 26.67 0) + (property "Datasheet" "" (id 3) (at 114.3 29.21 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d8735f69-b59e-4bd3-89d2-860d585f8594)) @@ -5495,7 +5765,7 @@ (property "Reference" "R21" (id 0) (at 135.89 182.88 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "4.2K" (id 1) (at 140.97 185.42 90) + (property "Value" "4.7K" (id 1) (at 140.97 185.42 90) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 139.192 182.88 90) @@ -5523,19 +5793,19 @@ (pin "2" (uuid f19e8d42-4281-4a2e-adad-d2101fe69a76)) ) - (symbol (lib_id "Device:R") (at 129.54 29.21 180) (unit 1) + (symbol (lib_id "Device:R") (at 132.08 34.29 180) (unit 1) (in_bom yes) (on_board yes) (uuid 764e0441-6ffc-4b72-9159-db7217f3aac8) - (property "Reference" "R18" (id 0) (at 127 30.4801 0) + (property "Reference" "R18" (id 0) (at 129.54 35.5601 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "100" (id 1) (at 129.54 27.94 90) + (property "Value" "820" (id 1) (at 132.08 33.02 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 131.318 29.21 90) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 133.858 34.29 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 129.54 29.21 0) + (property "Datasheet" "~" (id 3) (at 132.08 34.29 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 17c76ca0-808f-4141-b237-f4e0a4a9629c)) @@ -5623,15 +5893,15 @@ (pin "1" (uuid 60e8f760-7b85-4b04-a789-43fa320743a2)) ) - (symbol (lib_id "74xGxx:74LVC1G00") (at 109.22 21.59 0) (unit 1) + (symbol (lib_id "74xGxx:74LVC1G00") (at 114.3 24.13 0) (unit 1) (in_bom yes) (on_board yes) (uuid 7da55ff2-5c27-4712-8214-cf5f09b87cba) - (property "Reference" "U8" (id 0) (at 107.95 21.59 0)) - (property "Value" "74LVC1G00" (id 1) (at 101.6 16.51 0)) - (property "Footprint" "Package_TO_SOT_SMD:SOT-23-5" (id 2) (at 109.22 21.59 0) + (property "Reference" "U8" (id 0) (at 113.03 24.13 0)) + (property "Value" "74LVC1G00" (id 1) (at 123.19 19.05 0)) + (property "Footprint" "Package_TO_SOT_SMD:SOT-23-5" (id 2) (at 114.3 24.13 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 109.22 21.59 0) + (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 114.3 24.13 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d19ce3a1-eda7-431a-827c-f8d3fdb798de)) @@ -5723,6 +5993,22 @@ (pin "2" (uuid df3b57cf-922e-4fef-b754-ae0a845ba475)) ) + (symbol (lib_id "power:+3.3V") (at 143.51 100.33 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 89739c33-b847-4dbb-a906-68955fb247b6) + (property "Reference" "#PWR069" (id 0) (at 143.51 104.14 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+3.3V" (id 1) (at 147.32 100.33 0)) + (property "Footprint" "" (id 2) (at 143.51 100.33 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 143.51 100.33 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 44a5cbf2-fa6e-4780-9b64-d6e8d0fbeecf)) + ) + (symbol (lib_id "Device:C") (at 213.36 125.73 0) (unit 1) (in_bom yes) (on_board yes) (uuid 8ccd6eb0-645e-429d-a8d2-6abe1a7a5e87) @@ -5827,6 +6113,25 @@ (pin "2" (uuid 65b9717f-5409-4063-a314-fc695d002e77)) ) + (symbol (lib_id "Device:R") (at 133.35 110.49 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 985c296e-6292-4cd2-bb5d-5c7e660ec7cf) + (property "Reference" "R32" (id 0) (at 130.81 109.22 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "47K" (id 1) (at 133.35 109.22 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 135.128 110.49 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 133.35 110.49 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid f9d449d8-5edf-479a-9584-62839810f5fc)) + (pin "2" (uuid 81f59825-e05c-4bd7-a2d3-eeb2d84c5a40)) + ) + (symbol (lib_id "power:+3.3V") (at 120.65 180.34 0) (unit 1) (in_bom yes) (on_board yes) (uuid 9d61200a-84d7-48e1-a92f-05d3708a950c) @@ -6029,17 +6334,17 @@ (pin "2" (uuid a03ea2f2-9dff-473d-86ae-2e27c11d3869)) ) - (symbol (lib_id "power:GND") (at 140.97 33.02 0) (unit 1) + (symbol (lib_id "power:GND") (at 143.51 38.1 0) (unit 1) (in_bom yes) (on_board yes) (uuid b3990bac-24a3-4e8e-9a62-c5ab84f925de) - (property "Reference" "#PWR037" (id 0) (at 140.97 39.37 0) + (property "Reference" "#PWR037" (id 0) (at 143.51 44.45 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 139.7 36.83 0)) - (property "Footprint" "" (id 2) (at 140.97 33.02 0) + (property "Value" "GND" (id 1) (at 143.51 41.91 0)) + (property "Footprint" "" (id 2) (at 143.51 38.1 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 140.97 33.02 0) + (property "Datasheet" "" (id 3) (at 143.51 38.1 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 55941efe-3029-4600-8676-990681845c1d)) @@ -6157,19 +6462,19 @@ (pin "2" (uuid 3bc3e973-8a9c-444f-8b47-5767832a604f)) ) - (symbol (lib_id "Device:R") (at 78.74 184.15 0) (unit 1) + (symbol (lib_id "Device:R") (at 69.85 184.15 0) (unit 1) (in_bom yes) (on_board yes) (uuid b66bf47a-2f24-4e2c-a3cc-a5256624d3da) - (property "Reference" "R11" (id 0) (at 81.28 182.8799 0) + (property "Reference" "R11" (id 0) (at 72.39 181.61 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "22K" (id 1) (at 78.74 186.69 90) + (property "Value" "22K" (id 1) (at 69.85 185.42 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 76.962 184.15 90) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 68.072 184.15 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 78.74 184.15 0) + (property "Datasheet" "~" (id 3) (at 69.85 184.15 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid b61b9700-5527-48c2-8f58-1687b528ece7)) @@ -6251,6 +6556,25 @@ (pin "2" (uuid 6c036ffc-61a4-4445-9747-c888c912a8c8)) ) + (symbol (lib_id "Device:R") (at 148.59 140.97 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid bdc1d7f7-37f4-4a80-b358-b151bc2feff6) + (property "Reference" "R36" (id 0) (at 147.32 143.51 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1K" (id 1) (at 147.32 140.97 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 148.59 139.192 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 148.59 140.97 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid cf344ca6-bcaa-4bcf-b85e-45f9bb10f72a)) + (pin "2" (uuid 6e3f97aa-7e7b-41ef-a3d1-44539aee36b7)) + ) + (symbol (lib_id "power:PWR_FLAG") (at 34.29 31.75 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid beced16b-6b7c-4396-802b-d16f0bb89fcf) @@ -6304,6 +6628,21 @@ (pin "9" (uuid 4d8ab185-053c-4246-9886-3c76e3c53bd5)) ) + (symbol (lib_id "Device:R") (at 274.32 99.06 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid c1798f0a-c06b-4172-b4bf-5a050bf07012) + (property "Reference" "R31" (id 0) (at 274.32 101.6 90)) + (property "Value" "1K" (id 1) (at 274.32 99.06 90)) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 274.32 97.282 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 274.32 99.06 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 8349dac5-8853-43ec-b3c5-00a77378af30)) + (pin "2" (uuid c1ddc8c2-1b43-4fd3-a081-254931f93f2b)) + ) + (symbol (lib_id "power:+BATT") (at 63.5 151.13 0) (unit 1) (in_bom yes) (on_board yes) (uuid c258cf6a-e295-445f-8767-b33025632c11) @@ -6459,6 +6798,25 @@ (pin "1" (uuid 6189ec68-0758-4382-a142-01a377562fff)) ) + (symbol (lib_id "Device:R") (at 143.51 21.59 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid d6a8f1b1-3545-42dd-9d34-639ea0fe170e) + (property "Reference" "R30" (id 0) (at 140.97 22.8601 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "47" (id 1) (at 143.51 20.32 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 145.288 21.59 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 143.51 21.59 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 50219c48-db0d-42f2-b3c2-dd3f2779875c)) + (pin "2" (uuid dc9eef2b-298d-470a-b013-c88d291dd8d0)) + ) + (symbol (lib_id "ICs:RT9193") (at 40.64 87.63 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid d73caef3-0004-47d3-90d3-d6bd114aaeff) @@ -6512,19 +6870,19 @@ (pin "2" (uuid 9d982ec8-21c6-4716-bd5f-139e5984b1e0)) ) - (symbol (lib_id "Device:R") (at 72.39 187.96 90) (unit 1) + (symbol (lib_id "Device:R") (at 74.93 187.96 90) (unit 1) (in_bom yes) (on_board yes) (uuid dd0de575-ea27-4888-9618-3438f102c036) - (property "Reference" "R9" (id 0) (at 71.1199 185.42 0) + (property "Reference" "R9" (id 0) (at 77.47 185.42 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1K" (id 1) (at 74.93 187.96 90) + (property "Value" "1K" (id 1) (at 76.2 187.96 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 72.39 189.738 90) + (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 74.93 189.738 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 72.39 187.96 0) + (property "Datasheet" "~" (id 3) (at 74.93 187.96 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 31b6ddb1-fba3-40fb-99e7-50cdd5c563a6)) @@ -6617,6 +6975,22 @@ (pin "1" (uuid aa35cb08-5646-4b92-9d4a-50fbd368432c)) ) + (symbol (lib_id "power:GND") (at 166.37 63.5 0) (mirror y) (unit 1) + (in_bom yes) (on_board yes) + (uuid e57885cd-6805-4cf4-9c97-b21e2e5c595d) + (property "Reference" "#PWR047" (id 0) (at 166.37 69.85 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GND" (id 1) (at 166.37 67.31 0)) + (property "Footprint" "" (id 2) (at 166.37 63.5 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 166.37 63.5 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid aa35cb08-5646-4b92-9d4a-50fbd368432c)) + ) + (symbol (lib_id "Device:C") (at 21.59 90.17 0) (unit 1) (in_bom yes) (on_board yes) (uuid e62b99ae-6f7c-4c8a-abc5-c55756e8e3c4) @@ -6670,17 +7044,17 @@ (pin "2" (uuid 115a0018-a047-4b2a-852e-1e9f0505eeb1)) ) - (symbol (lib_id "power:+3.3V") (at 109.22 17.78 0) (unit 1) + (symbol (lib_id "power:+3.3V") (at 114.3 17.78 0) (unit 1) (in_bom yes) (on_board yes) (uuid ed40749e-3628-4ce9-97bc-7683c6dbf466) - (property "Reference" "#PWR031" (id 0) (at 109.22 21.59 0) + (property "Reference" "#PWR031" (id 0) (at 114.3 21.59 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3.3V" (id 1) (at 109.22 13.97 0)) - (property "Footprint" "" (id 2) (at 109.22 17.78 0) + (property "Value" "+3.3V" (id 1) (at 114.3 13.97 0)) + (property "Footprint" "" (id 2) (at 114.3 17.78 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 109.22 17.78 0) + (property "Datasheet" "" (id 3) (at 114.3 17.78 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 488a5b0d-08b2-442c-a9c4-88666b0be547)) @@ -6726,7 +7100,7 @@ (property "Value" "56" (id 1) (at 93.98 90.17 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 92.202 88.9 90) + (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 92.202 88.9 90) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 93.98 88.9 0) @@ -7141,6 +7515,9 @@ (path "/7714bcbf-e52f-487d-afc7-0e139ee58f68" (reference "#PWR068") (unit 1) (value "+3.3V") (footprint "") ) + (path "/89739c33-b847-4dbb-a906-68955fb247b6" + (reference "#PWR069") (unit 1) (value "+3.3V") (footprint "") + ) (path "/d0d4cf60-feaa-49e4-b0ab-2cca33396006" (reference "AE1") (unit 1) (value "Antenna_Shield") (footprint "RF_Antenna:Texas_SWRA117D_2.4GHz_Left") ) @@ -7313,7 +7690,7 @@ (reference "R13") (unit 1) (value "100") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/f3338e89-bae8-4429-a0e6-ac93f3f1ecfc" - (reference "R14") (unit 1) (value "56") (footprint "Resistor_SMD:R_0603_1608Metric") + (reference "R14") (unit 1) (value "56") (footprint "Resistor_SMD:R_0805_2012Metric") ) (path "/652e0e73-e98b-4100-acb8-91a231934b84" (reference "R15") (unit 1) (value "10K") (footprint "Resistor_SMD:R_0402_1005Metric") @@ -7325,22 +7702,22 @@ (reference "R17") (unit 1) (value "22K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/764e0441-6ffc-4b72-9159-db7217f3aac8" - (reference "R18") (unit 1) (value "100") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R18") (unit 1) (value "820") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/0ae81642-6c9f-4f05-ab0c-4fdd7fd79b27" (reference "R19") (unit 1) (value "100K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/250b148e-c877-4918-866c-ebb79d269cce" - (reference "R20") (unit 1) (value "4.2K") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R20") (unit 1) (value "4.7K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/72ef3a7b-45dc-4b5a-be57-48dcdb569973" - (reference "R21") (unit 1) (value "4.2K") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R21") (unit 1) (value "4.7K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/53f6b863-2f55-45b0-b145-271aaa6654dc" - (reference "R22") (unit 1) (value "100K") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R22") (unit 1) (value "30K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/3e32661e-818e-4426-a1c7-7bbfbf1ce4a2" - (reference "R23") (unit 1) (value "100K") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R23") (unit 1) (value "30K") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/428e8e2b-ad55-41cf-ba27-411c6eed1da3" (reference "R24") (unit 1) (value "2K2") (footprint "Resistor_SMD:R_0402_1005Metric") @@ -7357,6 +7734,30 @@ (path "/ea4a5e68-622c-42c9-990c-7d788665634d" (reference "R28") (unit 1) (value "100") (footprint "Resistor_SMD:R_0402_1005Metric") ) + (path "/5e884ce3-c29a-45fc-9cba-563bb994aeb1" + (reference "R29") (unit 1) (value "47K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/d6a8f1b1-3545-42dd-9d34-639ea0fe170e" + (reference "R30") (unit 1) (value "47") (footprint "Resistor_SMD:R_0603_1608Metric") + ) + (path "/c1798f0a-c06b-4172-b4bf-5a050bf07012" + (reference "R31") (unit 1) (value "1K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/985c296e-6292-4cd2-bb5d-5c7e660ec7cf" + (reference "R32") (unit 1) (value "47K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/11c56f8c-eb66-4d33-bce2-7874fbc60b32" + (reference "R33") (unit 1) (value "47K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/1f8b889a-c2d5-4a66-8124-0d99d4e36492" + (reference "R34") (unit 1) (value "1K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/1aaae979-230e-43c2-a208-e1b93c0eabb6" + (reference "R35") (unit 1) (value "1K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) + (path "/bdc1d7f7-37f4-4a80-b358-b151bc2feff6" + (reference "R36") (unit 1) (value "1K") (footprint "Resistor_SMD:R_0402_1005Metric") + ) (path "/2db480be-1b4c-42d7-a174-1779b71f1210" (reference "SW1") (unit 1) (value "SW_Push") (footprint "ICs:SW_Push_4mm_2mm") ) diff --git a/src/W800 SDK v1.00.08/app/app_config.h b/src/W800 SDK v1.00.08/app/app_config.h index 3d98391..4202a0e 100644 --- a/src/W800 SDK v1.00.08/app/app_config.h +++ b/src/W800 SDK v1.00.08/app/app_config.h @@ -45,7 +45,7 @@ #define LCD_DATA_COMMAND WM_IO_PB_08 #define LCD_RESET WM_IO_PB_09 #define LCD_PWM_BACKLIGHT WM_IO_PA_07 -#define LCD_PWM_CHANNEL 4 +#define LCD_PWM_CHANNEL (4) /** * @brief lcd touch panel @@ -75,6 +75,7 @@ * @brief vibration motor control pin * */ -#define VIBRATION_MOTOR_ENABLE WM_IO_PB_03 +#define VIBRATION_MOTOR_ENABLE WM_IO_PB_00 +#define VIBRATION_MOTOR_PWM_CHANNEL (0) #endif //APPCONFIG_H \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c index 6a38920..df7688e 100644 --- a/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c +++ b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.c @@ -1,4 +1,7 @@ #include "i2c.h" +#include "wm_gpio.h" +#include "FreeRTOS.h" +#include "app_log.h" #include "CST816D.h" bool CST816D_read_touch_event(CST816D_Touch_Data_t * const touch_data) @@ -22,3 +25,20 @@ bool CST816D_read_touch_event(CST816D_Touch_Data_t * const touch_data) touch_data->isValid = false; return false; } + +bool CST816D_set_power_mode(void) +{ + tls_gpio_cfg(WM_IO_PA_00, WM_GPIO_DIR_OUTPUT, WM_GPIO_ATTR_FLOATING); + + tls_gpio_write(WM_IO_PA_00, 0); + tls_os_time_delay(pdMS_TO_TICKS(5)); + tls_gpio_write(WM_IO_PA_00, 1); + tls_os_time_delay(pdMS_TO_TICKS(50)); + + uint8_t data; + + i2c_read_reg(CST816D_I2C_ADDR, 0xA5, &data); + + i2c_write_reg(CST816D_I2C_ADDR, 0xA5, 0x03); + APP_LOG_DEBUG("CST 0xA5 : %u", data); +} diff --git a/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h index a7484cf..3541da2 100644 --- a/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h +++ b/src/W800 SDK v1.00.08/app/app_drivers/i2c/CST816D.h @@ -56,4 +56,11 @@ typedef struct CST816D_Touch_Data */ bool CST816D_read_touch_event(CST816D_Touch_Data_t * const touch_data); +/** + * @brief Issues a hardware reset of the touch panel. + */ +void CST816D_hardware_reset(void); + +bool CST816D_set_power_mode(void); + #endif //CST816D_H \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c index b52f5f8..2654f28 100644 --- a/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c +++ b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.c @@ -222,6 +222,7 @@ void lcd_config_init(LCDConfig_t * const LCDConfig) LCDConfig->LCDChipSelectPin = -1; LCDConfig->LCDDataCommandPin = -1; LCDConfig->LCDResetPin = -1; + LCDConfig->LCDOrientation = LCD_ORIENTATION_DEFAULT; } @@ -415,6 +416,41 @@ void lcd_sleep(LCDConfig_t *const LCDConfig, bool state) lcd_set_data_command(LCDConfig, LCD_DATA); } +void lcd_orientation(LCDConfig_t *const LCDConfig, LCDOrientation_t orientation) +{ + if(!LCDConfig) return; + + //No need to apply the same config again + if(orientation == LCDConfig->LCDOrientation || orientation > LCD_ORIENTATION_270) return; + + lcd_set_data_command(LCDConfig, LCD_COMMAND); + lcd_set_cs(LCDConfig, LCD_SELECTED); + + mmc_sdio_driver_write_one(0x36); + + lcd_set_data_command(LCDConfig, LCD_DATA); + + LCDConfig->LCDOrientation = orientation; + + switch(orientation) + { + case LCD_ORIENTATION_90: + mmc_sdio_driver_write_one(0xE8); + break; + case LCD_ORIENTATION_180: + mmc_sdio_driver_write_one(0x48); + break; + case LCD_ORIENTATION_270: + mmc_sdio_driver_write_one(0x28); + break; + default: //Is default orientation eg : 0 + mmc_sdio_driver_write_one(0x88); + } + + lcd_set_cs(LCDConfig, LCD_RELEASED); + lcd_set_data_command(LCDConfig, LCD_DATA); +} + static void lcd_write_cmd_data_bytes(LCDConfig_t * const LCDConfig, const uint8_t *cmdAndData, uint32_t dataLengthInBytes) { // Select the slave CS line and tell him that he will receive a command ! diff --git a/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h index bd7180e..f319fff 100644 --- a/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h +++ b/src/W800 SDK v1.00.08/app/app_drivers/lcd/lcd.h @@ -6,7 +6,7 @@ /* Used SOC : W800 or W801 */ #define W800 -/* Display drive controller */ +/* Display controller IC */ #define ILI9341 0 #define ST7789V 1 #define GC9A01 2 @@ -35,6 +35,19 @@ typedef enum LCDSelect */ typedef void (*DrawFinishedCb_t)(void *arg); +/** + * @brief + * + */ +typedef enum LCDOrientation +{ + LCD_ORIENTATION_0 = 0, + LCD_ORIENTATION_DEFAULT = LCD_ORIENTATION_0, + LCD_ORIENTATION_90, + LCD_ORIENTATION_180, + LCD_ORIENTATION_270, +} LCDOrientation_t; + /** * @brief * @@ -49,13 +62,14 @@ typedef struct LCDConfig enum tls_io_name LCDResetPin; DrawFinishedCb_t drawFinishedCb; void *cbArg; + LCDOrientation_t LCDOrientation; } LCDConfig_t; /** * @brief Initializes the LCDConfig object to known values * Must be called before using any other LCD Driver API functions * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure */ void lcd_config_init(LCDConfig_t * const LCDConfig); @@ -64,7 +78,7 @@ void lcd_config_init(LCDConfig_t * const LCDConfig); * Usually called once the DMA engine is done with the transfer. * /!\ MUST BE CALLED BEFORE lcd_init FUNCTION * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure * @param drawFinishedCb the function to register of the form : void myFunc(void *arg) * @param arg a pointer to an optional argument passed to the callback function */ @@ -73,14 +87,14 @@ void lcd_register_draw_finished_cb(LCDConfig_t * const LCDConfig, DrawFinishedCb /** * @brief Initializes IOs using the configured LCDConfig object and the LCD display * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure */ void lcd_init(LCDConfig_t * const LCDConfig); /** * @brief Writes the frame to display's internal RAM * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure * @param x * @param y * @param width @@ -90,9 +104,9 @@ void lcd_init(LCDConfig_t * const LCDConfig); void lcd_draw_rect_frame(LCDConfig_t * const LCDConfig, uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t *data); /** - * @brief Sets the backlight to the specified brightness value + * @brief Sets the backlight to the specified brightness value (0 to 255) * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure * @param brightness a value from 0 (backlight off) to 255 backlight fully on. */ void lcd_set_backlight(LCDConfig_t * const LCDConfig, uint8_t brightness); @@ -100,14 +114,14 @@ void lcd_set_backlight(LCDConfig_t * const LCDConfig, uint8_t brightness); /** * @brief Issues a hardware reset of the lcd display * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure */ void lcd_hardware_reset(LCDConfig_t * const LCDConfig); /** * @brief Turns the LCD on or off, /!\ not the same as sleep mode ! * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure * @param state true to turn the LCD on or false to turn it off */ void lcd_on(LCDConfig_t * const LCDConfig, bool state); @@ -116,9 +130,17 @@ void lcd_on(LCDConfig_t * const LCDConfig, bool state); * @brief Puts the LCD in power down mode (sleep) or power up mode (active) * Sleep mode puts the LCD in it's lowest power state * - * @param LCDConfig a pointer a user allocated LCDConfig_t structure + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure * @param state true to put the LCD in sleep mode or false to put it in active mode */ void lcd_sleep(LCDConfig_t * const LCDConfig, bool state); +/** + * @brief Sets the LCD orientation. + * + * @param LCDConfig a pointer to a user allocated LCDConfig_t structure + * @param orientation the value of the orientation to set + */ +void lcd_orientation(LCDConfig_t * const LCDConfig, LCDOrientation_t orientation); + #endif //LCD_H \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/app_drivers/watch_peripherals/watch_peripherals.c b/src/W800 SDK v1.00.08/app/app_drivers/watch_peripherals/watch_peripherals.c index faa784e..23407e8 100644 --- a/src/W800 SDK v1.00.08/app/app_drivers/watch_peripherals/watch_peripherals.c +++ b/src/W800 SDK v1.00.08/app/app_drivers/watch_peripherals/watch_peripherals.c @@ -14,7 +14,7 @@ static void vibration_motor_timer_irq_cb(void *p) { (void)p; //tls_gpio_write(VIBRATION_MOTOR_ENABLE, 0); - tls_pwm_stop(3); + tls_pwm_stop(VIBRATION_MOTOR_PWM_CHANNEL); tls_gpio_cfg(VIBRATION_MOTOR_ENABLE, WM_GPIO_DIR_OUTPUT, WM_GPIO_ATTR_FLOATING); tls_gpio_write(VIBRATION_MOTOR_ENABLE, 0); APP_LOG_DEBUG("Vibration stopped"); @@ -69,9 +69,8 @@ void watch_peripherals_vibrate(uint8_t strength, uint32_t durationMs) APP_LOG_DEBUG("Vibration started"); /* We start the timer which will stop the vibration after durationMs time */ tls_timer_change(_vibration_motor_timer_id, durationMs); - //tls_gpio_write(VIBRATION_MOTOR_ENABLE, 1); - wm_pwm3_config(VIBRATION_MOTOR_ENABLE); - tls_pwm_init(3, 10000, 0, 0); - tls_pwm_duty_set(3, strength); + wm_pwm0_config(VIBRATION_MOTOR_ENABLE); + tls_pwm_init(VIBRATION_MOTOR_PWM_CHANNEL, 10000, 0, 0); + tls_pwm_duty_set(VIBRATION_MOTOR_PWM_CHANNEL, strength); tls_timer_start(_vibration_motor_timer_id); } diff --git a/src/W800 SDK v1.00.08/app/gfx/gfx_task.c b/src/W800 SDK v1.00.08/app/gfx/gfx_task.c index 4514dd5..50c53b5 100644 --- a/src/W800 SDK v1.00.08/app/gfx/gfx_task.c +++ b/src/W800 SDK v1.00.08/app/gfx/gfx_task.c @@ -80,11 +80,21 @@ static void setTimeoutCb(uint8_t timeout) persistency_get_settings()->display.sleep_timeout = timeout; } +static void setOrientationCb(uint8_t orientation) +{ + extern LCDConfig_t LCDConfig; + lcd_orientation(&LCDConfig, orientation); + persistency_get_settings()->display.orientation = orientation; + // Forces to redraw the full screen to avoid strange artifact + lv_obj_invalidate(lv_scr_act()); +} + SettingsScreenAPIInterface_t settingsScreenAPIInterface = { .setBrightnessSettingsCb = setBrightnessCb, .setTimeSettingsCb = setTimeCb, .setTimeoutSettingsCb = setTimeoutCb, + .setOrientationSettingsCb = setOrientationCb, }; static uint16_t angle_with_offset(uint16_t angle, uint16_t offset) @@ -302,6 +312,7 @@ void gfx_task(void *param) //lcd_on(&LCDConfig, false); lcd_sleep(&LCDConfig, true); QMC5883L_set_power_mode(Standby); + CST816D_set_power_mode(); // Let's sleep tls_pmu_sleep_start(); // On wake up, we force the watch face to sync up with the rtc /!\ RTC update delay WTF ? @@ -313,5 +324,27 @@ void gfx_task(void *param) lcd_sleep(&LCDConfig, false); setBrightness(persistency_get_settings()->display.brightness); } + + /* Throttle CPU freq down when inactive to save power or to increase responsiveness */ + tls_sys_clk clk; + tls_sys_clk_get(&clk); + if(lv_disp_get_inactive_time(NULL) > 5000) + { + if(clk.cpuclk != 40) + { + tls_sys_clk_set(CPU_CLK_40M); + APP_LOG_DEBUG("CPU 40Mhz"); + } + + } + else + { + if(clk.cpuclk != 160) + { + tls_sys_clk_set(CPU_CLK_160M); + APP_LOG_DEBUG("CPU 160Mhz"); + } + + } } } \ No newline at end of file diff --git a/src/W800 SDK v1.00.08/app/gfx/settings_screen.c b/src/W800 SDK v1.00.08/app/gfx/settings_screen.c index 4b517a1..bdbd9d5 100644 --- a/src/W800 SDK v1.00.08/app/gfx/settings_screen.c +++ b/src/W800 SDK v1.00.08/app/gfx/settings_screen.c @@ -6,13 +6,12 @@ static const char *day_options = "01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31"; static const char *month_options = "01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12"; static const char *year_options = "22\n23\n24\n25\n26\n27\n28\n29\n30"; - static const char *hour_options = "00\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23"; static const char *second_minute_options = "00\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38\n39\n40\n41\n42\n43\n44\n45\n46\n47\n48\n49\n50\n51\n52\n53\n54\n55\n56\n57\n58\n59"; +static const char *date_format = "dd/mm/yyyy\ndd/mm/yy\nyyyy/mm/dd\nyy/mm/dd"; static const char *timeout_options = "0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60"; - -const char *date_format = "dd/mm/yyyy\ndd/mm/yy\nyyyy/mm/dd\nyy/mm/dd"; +static const char *orientation_format = "Default\n90°\n180°\n270°"; static void gesture_event_cb(lv_event_t * e) { @@ -106,6 +105,18 @@ static void timeout_roller_cb(lv_event_t * e) settingsScreen->settingsScreenAPIInterface.setTimeoutSettingsCb(timeout); } +static void orientation_dropdown_cb(lv_event_t * e) +{ + SettingsScreen_t *settingsScreen = e->user_data; + + if(!settingsScreen->settingsScreenAPIInterface.setOrientationSettingsCb) return; + + lv_obj_t *dropdown = lv_event_get_target(e); + uint8_t orientation = lv_dropdown_get_selected(dropdown); + + settingsScreen->settingsScreenAPIInterface.setOrientationSettingsCb(orientation); +} + static lv_obj_t* add_sidebar_entry_to_menu(lv_obj_t *parent, const char *title, lv_obj_t *menu, lv_obj_t *pageToShow) { lv_obj_t *container = lv_menu_cont_create(parent); @@ -288,7 +299,6 @@ void settings_screen_create(SettingsScreen_t * const settingsScreen) lv_obj_t *date_dropdown = lv_dropdown_create(container); lv_dropdown_set_options_static(date_dropdown, date_format); - //We create the menu page for the display settings lv_obj_t *menu_page_2 = lv_menu_page_create(menu, NULL); @@ -317,6 +327,14 @@ void settings_screen_create(SettingsScreen_t * const settingsScreen) lv_label_set_text_static(timeout_label, "Second(s)"); lv_obj_set_style_pad_top(timeout_label, 25, LV_PART_MAIN); + menu_page_label = lv_label_create(section); + lv_label_set_text_static(menu_page_label, "Orientation :"); + container = create_section_container(section); + + lv_obj_t *orientation_dropdown = lv_dropdown_create(container); + lv_dropdown_set_options_static(orientation_dropdown, orientation_format); + lv_obj_add_event_cb(orientation_dropdown, &(orientation_dropdown_cb), LV_EVENT_VALUE_CHANGED, settingsScreen); + //We create the side bar page lv_obj_t *sidebar_page = lv_menu_page_create(menu, NULL); lv_obj_t *settings_section_1 = lv_menu_section_create(sidebar_page); diff --git a/src/W800 SDK v1.00.08/app/gfx/settings_screen.h b/src/W800 SDK v1.00.08/app/gfx/settings_screen.h index d309ba0..428df08 100644 --- a/src/W800 SDK v1.00.08/app/gfx/settings_screen.h +++ b/src/W800 SDK v1.00.08/app/gfx/settings_screen.h @@ -8,6 +8,7 @@ typedef struct SettingsScreenAPIInterface void (*setBrightnessSettingsCb)(uint8_t brightness); void (*setTimeSettingsCb)(uint8_t hour, uint8_t minute, uint8_t second, uint8_t day, uint8_t month, uint8_t year); void (*setTimeoutSettingsCb)(uint8_t timeout); + void (*setOrientationSettingsCb)(uint8_t orientation); } SettingsScreenAPIInterface_t; typedef struct SettingsScreen diff --git a/src/W800 SDK v1.00.08/app/main.c b/src/W800 SDK v1.00.08/app/main.c index bb2a9de..05ef144 100644 --- a/src/W800 SDK v1.00.08/app/main.c +++ b/src/W800 SDK v1.00.08/app/main.c @@ -32,14 +32,17 @@ void user_task_main(void *param) TickType_t time_ref = tls_os_get_time(); for(;;) { + tls_sys_clk clk; + tls_sys_clk_get(&clk); char *buf = tls_mem_alloc(800); if(buf) { UBaseType_t writtenSize = vTaskList((char *)buf, 800); - APP_LOG_INFO("Available RAM (bytes)/Total RAM (bytes) : %u/%u"NEW_LINE"Reset reason : %d"NEW_LINE"Tasks (%lu) :"NEW_LINE, + APP_LOG_INFO("Available RAM (bytes)/Total RAM (bytes) : %u/%u"NEW_LINE"Reset reason : %d"NEW_LINE"Clk : apb(%u), cpu(%u), wlan(%u)"NEW_LINE"Tasks (%lu) :"NEW_LINE, tls_mem_get_avail_heapsize(), total_mem_size, tls_sys_get_reboot_reason(), + clk.apbclk, clk.cpuclk, clk.wlanclk, writtenSize); printf("\n%s", buf); tls_mem_free(buf); diff --git a/src/W800 SDK v1.00.08/app/persistency/watch_settings.c b/src/W800 SDK v1.00.08/app/persistency/watch_settings.c index 48ca95c..f861ddf 100644 --- a/src/W800 SDK v1.00.08/app/persistency/watch_settings.c +++ b/src/W800 SDK v1.00.08/app/persistency/watch_settings.c @@ -3,7 +3,7 @@ /* WatchSetting object with default values */ static WatchSettings_t watchSettings = { - .timeAndDate = {.config = 0}, + .timeAndDate = {.hour_format = 0, .date_format = 0, .automatic_time_and_date = 0}, .display = {.brightness = 255, .sleep_timeout = 0,}, }; diff --git a/src/W800 SDK v1.00.08/app/persistency/watch_settings.h b/src/W800 SDK v1.00.08/app/persistency/watch_settings.h index 52e05d7..c6625db 100644 --- a/src/W800 SDK v1.00.08/app/persistency/watch_settings.h +++ b/src/W800 SDK v1.00.08/app/persistency/watch_settings.h @@ -3,14 +3,12 @@ #include "wm_type_def.h" -#define HOUR_FORMAT(X) ((X) & 0x01) -#define DATE_FORMAT(X) (((X) & 0x0E) >> 1) -#define AUTOMATIC_TIME_AND_DATE(X) (((X) & 0x10) >> 4) - /* Time and Date Settings */ typedef struct TimeAndDate { - uint32_t config; + uint32_t hour_format:1; + uint32_t date_format:2; + uint32_t automatic_time_and_date:1; } TimeAndDate_t; /* Display Settings */ @@ -18,6 +16,7 @@ typedef struct Display { uint8_t brightness; uint8_t sleep_timeout; + uint8_t orientation:2; } Display_t; /* Connectivity Settings */ diff --git a/src/W800 SDK v1.00.08/lvgl/lvgl_port/lv_port_indev.c b/src/W800 SDK v1.00.08/lvgl/lvgl_port/lv_port_indev.c index 35f9d35..e9d2c9c 100644 --- a/src/W800 SDK v1.00.08/lvgl/lvgl_port/lv_port_indev.c +++ b/src/W800 SDK v1.00.08/lvgl/lvgl_port/lv_port_indev.c @@ -12,6 +12,7 @@ #include "lv_port_indev.h" #include "wm_gpio.h" #include "app_config.h" +#include "lcd.h" #include "CST816D.h" #include "watch_peripherals.h" @@ -115,6 +116,7 @@ void lv_port_indev_init(void) static void touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) { + extern LCDConfig_t LCDConfig; static lv_coord_t last_x = 0; static lv_coord_t last_y = 0; @@ -130,9 +132,26 @@ static void touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) data->state = LV_INDEV_STATE_REL; } - // Set the last pressed coordinates - data->point.x = 239-last_x; - data->point.y = 239-last_y; + // Set the last pressed coordinates taking into account the current display orientation + switch(LCDConfig.LCDOrientation) + { + case LCD_ORIENTATION_90: + data->point.x = 239-last_y; + data->point.y = last_x; + break; + case LCD_ORIENTATION_180: + data->point.x = last_x; + data->point.y = last_y; + break; + case LCD_ORIENTATION_270: + data->point.x = last_y; + data->point.y = 239-last_x; + break; + default: + data->point.x = 239-last_x; + data->point.y = 239-last_y; + break; + } } #else /*Enable this file at the top*/