fix: update for breaking change in 2024.12.0b1

Fixed ESPHome 2024.6.0 breaking change where OTA requires platform

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: tjhorner
 ko_fi: tjhorner

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,50 @@
+name: Bug Report
+description: File a bug report or get help with an issue.
+labels: ["bug"]
+assignees:
+  - tjhorner
+body:
+  - type: checkboxes
+    id: troubleshooting-followed
+    attributes:
+      label: Troubleshooting Guide
+      description: Please confirm you have followed the [troubleshooting guide](https://upsy-desky.tjhorner.dev/docs/troubleshooting).
+      options:
+        - label: I have followed the steps in the troubleshooting guide and my issue is either not listed or is not solved.
+          required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please describe the bug you encountered, and what you expected to happen instead.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: Please copy and paste any relevant log output. Learn how to obtain logs [here](https://upsy-desky.tjhorner.dev/docs/troubleshooting/#other-issues).
+      render: plain text
+  - type: input
+    id: config-version
+    attributes:
+      label: Which version of the Upsy Desky firmware config are you running?
+      placeholder: "1.1.1"
+  - type: dropdown
+    id: update-management
+    attributes:
+      label: How do you manage your Upsy Desky's updates?
+      options:
+        - OTA Updates
+        - ESPHome YAML Config
+  - type: input
+    id: esphome-version
+    attributes:
+      label: If you're using an ESPHome YAML config, which version of ESPHome are you running?
+      placeholder: "2023.5.4"
+  - type: textarea
+    id: esphome-config
+    attributes:
+      label: ESPHome Config
+      description: If you have your own ESPHome YAML configuration, please paste it here. Remember to redact any sensitive information like encryption keys or passwords.
+      render: YAML

.github/workflows/build.yaml

@@ -22,7 +22,7 @@ jobs:
         run: |
           esphome compile stock.yaml
           mkdir -p bin
-          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware-factory.bin bin/firmware-factory.bin
+          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.factory.bin bin/firmware-factory.bin
           cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.bin bin/firmware.bin
 
       - name: Compile Debug Firmware
@@ -31,7 +31,7 @@ jobs:
           rm -rf .esphome/build/upsy-desky
           esphome compile debug.yaml
           mkdir -p bin
-          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware-factory.bin bin/debug-firmware-factory.bin
+          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.factory.bin bin/debug-firmware-factory.bin
           cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.bin bin/debug-firmware.bin
 
       - name: Upload Firmware

.github/workflows/nightly-build.yaml

@@ -0,0 +1,40 @@
+name: Nightly Stock Firmware Build
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+    name: Build Firmware
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+
+      - name: Install ESPHome
+        run: pip install --pre --user esphome
+      
+      - name: Compile Release Firmware
+        working-directory: firmware
+        run: |
+          esphome compile stock.yaml
+          mkdir -p bin
+          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.factory.bin bin/firmware-factory.bin
+          cp .esphome/build/upsy-desky/.pioenvs/upsy-desky/firmware.bin bin/firmware.bin
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: firmware-bin
+          path: firmware/bin
+
+      - name: Send Discord failure notification
+        if: failure()
+        uses: appleboy/discord-action@master
+        with:
+          webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+          webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+          color: "#FF6961"
+          message: "The latest nightly build failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.gitignore

@@ -0,0 +1 @@
+pcb/footprints/.svg2shenzhen-cache

README.md

@@ -46,10 +46,7 @@ Or whatever else you'd like. The possibilities are endless! As long as the possi
 
 ## Compatibility
 
-Any standing desk that uses RJ45 to connect to the keypad is likely compatible, but these brands of desks have been verified to work, with official firmware provided:
-
-- UPLIFT v2
-- Fully Jarvis
+Any standing desk that uses RJ45 to connect to the keypad is likely compatible, but the control boxes listed [here](https://upsy-desky.tjhorner.dev/docs/reference/compatibility/) are verified to be compatible.
 
 ## Documentation
 

firmware/README.md

@@ -13,4 +13,6 @@ It is organized like so:
 Major parts of the config are separated into "addons" so they can be easily included or excluded. The following addons are available:
 
 - `presets.yaml`: Adds support for recalling and setting presets on the desk control box
-- `runtime-config.yaml`: Adds support for runtime configuration options (you might want to remove this if you are configuring everything via ESPHome yaml)
+- `runtime-config.yaml`: Adds support for runtime configuration options (you might want to remove this if you are configuring everything via ESPHome yaml)
+- `bluetooth-proxy.yaml`: Contains the necessary configuration to use the Upsy Desky as a [Bluetooth Proxy](https://esphome.io/components/bluetooth_proxy.html)
+- `stable-ids.yaml`: Contains configuration necessary to keep some entity IDs stable via the HTTP API

firmware/addons/bluetooth-proxy.yaml

@@ -0,0 +1,7 @@
+substitutions:
+  bluetooth_proxy_active_connections: "true"
+
+esp32_ble_tracker:
+
+bluetooth_proxy:
+  active: ${bluetooth_proxy_active_connections}

firmware/addons/presets.yaml

@@ -2,28 +2,34 @@ output:
   - platform: gpio
     inverted: true
     id: button_bit1
-    pin: ${button_bit1_pin}
+    pin:
+      number: ${button_bit1_pin}
+      allow_other_uses: true
 
   - platform: gpio
     inverted: true
     id: button_bit2
-    pin: ${button_bit2_pin}
+    pin:
+      number: ${button_bit2_pin}
+      allow_other_uses: true
 
   - platform: gpio
     inverted: true
     id: button_bit4
-    pin: ${button_bit4_pin}
+    pin:
+      number: ${button_bit4_pin}
 
   - platform: gpio
     inverted: true
     id: button_m
-    pin: ${button_m_pin}
+    pin:
+      number: ${button_m_pin}
 
 button:
   # Recall Presets
   - platform: template
     id: recall_preset_1
-    name: "${friendly_name} Preset 1"
+    name: "Preset 1"
     icon: "mdi:numeric-1-box"
     on_press:
       - output.turn_on: button_bit1
@@ -34,7 +40,7 @@ button:
 
   - platform: template
     id: recall_preset_2
-    name: "${friendly_name} Preset 2"
+    name: "Preset 2"
     icon: "mdi:numeric-2-box"
     on_press:
       - output.turn_on: button_bit4
@@ -43,7 +49,7 @@ button:
 
   - platform: template
     id: recall_preset_3
-    name: "${friendly_name} Preset 3"
+    name: "Preset 3"
     icon: "mdi:numeric-3-box"
     on_press:
       - output.turn_on: button_bit2
@@ -54,7 +60,7 @@ button:
 
   - platform: template
     id: recall_preset_4
-    name: "${friendly_name} Preset 4"
+    name: "Preset 4"
     icon: "mdi:numeric-4-box"
     on_press:
       - output.turn_on: button_bit4
@@ -65,7 +71,7 @@ button:
 
   # Set Presets
   - platform: template
-    name: "${friendly_name} Set Preset 1"
+    name: "Set Preset 1"
     entity_category: "config"
     icon: "mdi:numeric-1-box-multiple"
     on_press:
@@ -75,7 +81,7 @@ button:
       - button.press: recall_preset_1
 
   - platform: template
-    name: "${friendly_name} Set Preset 2"
+    name: "Set Preset 2"
     entity_category: "config"
     icon: "mdi:numeric-2-box-multiple"
     on_press:
@@ -85,7 +91,7 @@ button:
       - button.press: recall_preset_2
 
   - platform: template
-    name: "${friendly_name} Set Preset 3"
+    name: "Set Preset 3"
     entity_category: "config"
     icon: "mdi:numeric-3-box-multiple"
     on_press:
@@ -95,7 +101,7 @@ button:
       - button.press: recall_preset_3
 
   - platform: template
-    name: "${friendly_name} Set Preset 4"
+    name: "Set Preset 4"
     entity_category: "config"
     icon: "mdi:numeric-4-box-multiple"
     on_press:

firmware/addons/runtime-config.yaml

@@ -1,19 +1,7 @@
 select:
   - platform: template
-    name: "${friendly_name} Height Decoder Variant"
-    entity_category: "config"
-    optimistic: true
-    restore_value: true
-    options:
-      - uplift
-      - jarvis
-      - omnidesk
-    initial_option: ${standing_desk_variant}
-    on_value:
-      then:
-        lambda: "id(desk_height)->set_decoder_variant(x);"
-  - platform: template
-    name: "${friendly_name} Height Units"
+    id: height_units_config
+    name: "Height Units"
     entity_category: "config"
     optimistic: true
     restore_value: true
@@ -24,12 +12,24 @@ select:
     on_value:
       then:
         lambda: |
-          id(desk_height)->set_unit_of_measurement(x);
-          id(target_desk_height)->traits.set_unit_of_measurement(x);
+          const char *unit = id(height_units_config)->state.c_str();
+          id(desk_height)->set_unit_of_measurement(unit);
+          id(target_desk_height)->traits.set_unit_of_measurement(unit);
+
+button:
+  - platform: template
+    name: "Re-Detect Decoder"
+    entity_category: "config"
+    icon: "mdi:cog-refresh"
+    on_press:
+      - uart.write:
+          id: handset_tx
+          data: [ 0x0 ]
+      - standing_desk_height.detect_decoder: desk_height
 
 number:
   - platform: template
-    name: "${friendly_name} Min Target Height"
+    name: "Min Target Height"
     entity_category: "config"
     min_value: 0
     max_value: 150
@@ -42,7 +42,7 @@ number:
         lambda: |
           id(target_desk_height)->traits.set_min_value(x);
   - platform: template
-    name: "${friendly_name} Max Target Height"
+    name: "Max Target Height"
     entity_category: "config"
     min_value: 0
     max_value: 150

firmware/base.yaml

@@ -1,7 +1,9 @@
 # Essential ESPHome config options
 esphome:
   name: "${name}"
+  friendly_name: "${friendly_name}"
   name_add_mac_suffix: true
+  min_version: "2024.6.0"
   on_boot:
     then:
       # Wakes up the desk and reports height
@@ -10,7 +12,7 @@ esphome:
           data: [ 0x0 ]
   project:
     name: tj_horner.upsy_desky
-    version: "0.3.1"
+    version: "4.0.2"
 
 uart:
   id: handset_tx
@@ -19,19 +21,20 @@ uart:
 
 esp32:
   board: esp32dev
+  framework:
+    type: esp-idf
 
 # Configurable options
 substitutions:
   name: "upsy-desky"
   friendly_name: "Upsy Desky"
-  desk_height_name: "${friendly_name} Desk Height"
-  target_desk_height_name: "${friendly_name} Target Desk Height"
+  desk_height_name: "Desk Height"
+  target_desk_height_name: "Target Desk Height"
 
   # Standing Desk Component Config
   standing_desk_uart_rx_pin: "17"
   standing_desk_up_pin: "21"
   standing_desk_down_pin: "22"
-  standing_desk_variant: "uplift"
   standing_desk_min_height: "25.2"
   standing_desk_max_height: "50.8"
 
@@ -45,18 +48,18 @@ substitutions:
   default_height_units: "in" # Must be "in" or "cm"
 
 packages:
-  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml@master
+  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml
   addon_presets: !include addons/presets.yaml
   addon_stable_ids: !include addons/stable-ids.yaml
   addon_runtime_config: !include addons/runtime-config.yaml
 
 button:
   - platform: restart
-    name: "${friendly_name} Restart"
+    name: "Restart"
 
 light:
   - platform: status_led
     id: upsy_desky_status_led
-    name: "${friendly_name} Status LED"
+    name: "Status LED"
     pin: GPIO23
     restore_mode: RESTORE_DEFAULT_ON

firmware/debug.yaml

@@ -10,4 +10,4 @@ debug:
 text_sensor:
   - platform: debug
     device:
-      name: "${friendly_name} Device Info"
+      name: "Device Info"

firmware/stock.yaml

@@ -1,6 +1,15 @@
 packages:
   base: !include base.yaml
 
+external_components:
+  - source: github://tjhorner/esphome-custom-components
+    components: [ project_version ]
+
+text_sensor:
+  - platform: project_version
+    name: "Upsy Desky Firmware Version"
+    internal: true
+
 logger:
   level: INFO
 
@@ -12,15 +21,20 @@ captive_portal:
 
 improv_serial:
 
+esp32_improv:
+  authorizer: none
+
 api:
-  password: ""
   reboot_timeout: 0s
 
 web_server:
   port: 80
+  version: 2
+  js_url: "https://upsy-desky.tjhorner.dev/esphome-webserver/www.js"
 
 ota:
-  password: ""
+  - platform: esphome
+    password: ""
 
 dashboard_import:
-  package_import_url: github://tjhorner/upsy-desky/firmware/stock.yaml@v0.3.1
+  package_import_url: github://tjhorner/upsy-desky/firmware/stock.yaml@v4.0.2

pcb/footprints/amomg.kicad_mod

@@ -1,81 +0,0 @@
-(module "amomg" (layer F.Cu)
-(fp_text reference Ref** (at 0 0) (layer F.SilkS) hide
-(effects (font (size 1.27 1.27) (thickness 0.15)))
-)
-(fp_text value Val** (at 0 0) (layer F.SilkS) hide
-(effects (font (size 1.27 1.27) (thickness 0.15)))
-)
-  (fp_poly (pts (xy 0.550560 -5.793279) (xy 0.768158 -5.787065) (xy 0.975274 -5.776127) (xy 1.160688 -5.760760) (xy 1.289041 -5.745008) (xy 1.569472 -5.687879) (xy 1.846948 -5.601976) (xy 2.108464 -5.491872)
-     (xy 2.294129 -5.391450) (xy 2.436720 -5.299253) (xy 2.567899 -5.200795) (xy 2.692922 -5.090746) (xy 2.817043 -4.963776) (xy 2.945518 -4.814557) (xy 3.083601 -4.637760) (xy 3.216911 -4.455583)
-     (xy 3.345712 -4.285092) (xy 3.479651 -4.128938) (xy 3.632520 -3.971323) (xy 3.678882 -3.926416) (xy 3.841989 -3.769983) (xy 3.977521 -3.639257) (xy 4.088592 -3.530785) (xy 4.178317 -3.441114)
-     (xy 4.249809 -3.366792) (xy 4.306182 -3.304366) (xy 4.350552 -3.250383) (xy 4.386031 -3.201391) (xy 4.415735 -3.153937) (xy 4.442777 -3.104568) (xy 4.470271 -3.049832) (xy 4.471170 -3.048000)
-     (xy 4.545224 -2.884818) (xy 4.595950 -2.739963) (xy 4.626908 -2.599062) (xy 4.641658 -2.447746) (xy 4.644189 -2.349500) (xy 4.634447 -2.141977) (xy 4.600487 -1.954390) (xy 4.539247 -1.780034)
-     (xy 4.447664 -1.612200) (xy 4.322675 -1.444183) (xy 4.161217 -1.269276) (xy 4.142300 -1.250511) (xy 3.947599 -1.058751) (xy 3.953888 -0.905084) (xy 3.967633 -0.511469) (xy 3.976649 -0.122157)
-     (xy 3.980996 0.258024) (xy 3.980735 0.624247) (xy 3.975929 0.971685) (xy 3.966637 1.295510) (xy 3.952921 1.590894) (xy 3.934843 1.853011) (xy 3.916486 2.042584) (xy 3.881517 2.341972)
-     (xy 3.844474 2.641108) (xy 3.805901 2.936583) (xy 3.766344 3.224989) (xy 3.726350 3.502915) (xy 3.686464 3.766955) (xy 3.647233 4.013699) (xy 3.609202 4.239737) (xy 3.572918 4.441662)
-     (xy 3.538925 4.616065) (xy 3.507771 4.759536) (xy 3.480001 4.868668) (xy 3.456161 4.940050) (xy 3.450456 4.952434) (xy 3.362089 5.081456) (xy 3.238456 5.196091) (xy 3.085337 5.292309)
-     (xy 2.908514 5.366083) (xy 2.820459 5.391460) (xy 2.739139 5.407577) (xy 2.641563 5.418396) (xy 2.519482 5.424518) (xy 2.364650 5.426543) (xy 2.338917 5.426532) (xy 2.050374 5.415576)
-     (xy 1.797369 5.383428) (xy 1.578461 5.329502) (xy 1.392210 5.253215) (xy 1.237174 5.153982) (xy 1.111913 5.031217) (xy 1.018283 4.890579) (xy 0.966508 4.780914) (xy 0.926023 4.664264)
-     (xy 0.895314 4.533112) (xy 0.872865 4.379942) (xy 0.857163 4.197238) (xy 0.849614 4.053417) (xy 0.842346 3.902056) (xy 0.834151 3.787071) (xy 0.823543 3.702507) (xy 0.809038 3.642410)
-     (xy 0.789151 3.600827) (xy 0.762395 3.571802) (xy 0.727288 3.549383) (xy 0.723392 3.547343) (xy 0.674893 3.527446) (xy 0.603274 3.503723) (xy 0.523027 3.480314) (xy 0.448642 3.461359)
-     (xy 0.394611 3.450997) (xy 0.383237 3.450167) (xy 0.374478 3.466614) (xy 0.367860 3.517310) (xy 0.363273 3.604281) (xy 0.360610 3.729558) (xy 0.359761 3.889375) (xy 0.356446 4.175187)
-     (xy 0.345914 4.422975) (xy 0.327134 4.636592) (xy 0.299073 4.819893) (xy 0.260702 4.976732) (xy 0.210988 5.110963) (xy 0.148899 5.226442) (xy 0.073405 5.327021) (xy -0.016527 5.416555)
-     (xy -0.058231 5.451301) (xy -0.169532 5.528776) (xy -0.305433 5.606771) (xy -0.451232 5.678020) (xy -0.592227 5.735256) (xy -0.698500 5.767748) (xy -0.805460 5.787109) (xy -0.936127 5.801270)
-     (xy -1.076548 5.809614) (xy -1.212777 5.811522) (xy -1.330862 5.806377) (xy -1.393530 5.798560) (xy -1.571898 5.754962) (xy -1.754695 5.689860) (xy -1.922523 5.610585) (xy -1.981280 5.576446)
-     (xy -2.125620 5.471302) (xy -2.264694 5.341702) (xy -2.387918 5.199006) (xy -2.484708 5.054572) (xy -2.507417 5.011776) (xy -2.559032 4.884266) (xy -2.608072 4.716644) (xy -2.654078 4.511079)
-     (xy -2.696590 4.269740) (xy -2.735147 3.994793) (xy -2.750604 3.864937) (xy -2.764606 3.743568) (xy -2.777314 3.637856) (xy -2.787876 3.554533) (xy -2.795442 3.500329) (xy -2.799035 3.481958)
-     (xy -2.821007 3.478465) (xy -2.876573 3.471971) (xy -2.957175 3.463421) (xy -3.048000 3.454371) (xy -3.323482 3.415496) (xy -3.565619 3.354710) (xy -3.778171 3.270486) (xy -3.964898 3.161294)
-     (xy -4.129560 3.025603) (xy -4.149023 3.006457) (xy -4.250334 2.895081) (xy -4.333411 2.779720) (xy -4.401139 2.653442) (xy -4.456405 2.509316) (xy -4.502093 2.340411) (xy -4.541090 2.139797)
-     (xy -4.559812 2.019747) (xy -4.600505 1.666082) (xy -4.625036 1.273973) (xy -4.631912 0.920021) (xy -3.952326 0.920021) (xy -3.944358 1.222968) (xy -3.940979 1.291722) (xy -3.922930 1.569086)
-     (xy -3.900703 1.806818) (xy -3.873774 2.007466) (xy -3.841618 2.173573) (xy -3.803710 2.307684) (xy -3.759525 2.412345) (xy -3.708540 2.490100) (xy -3.689685 2.510737) (xy -3.593604 2.585577)
-     (xy -3.465732 2.654210) (xy -3.316543 2.712894) (xy -3.156506 2.757886) (xy -2.996095 2.785445) (xy -2.902372 2.792101) (xy -2.830828 2.794000) (xy -2.842965 2.693459) (xy -2.845974 2.652130)
-     (xy -2.849835 2.573156) (xy -2.854387 2.461212) (xy -2.859465 2.320976) (xy -2.864909 2.157122) (xy -2.870556 1.974326) (xy -2.876243 1.777265) (xy -2.881368 1.587500) (xy -2.889734 1.162411)
-     (xy -2.893259 0.722176) (xy -2.893003 0.624417) (xy -2.210725 0.624417) (xy -2.209285 1.101229) (xy -2.204825 1.539503) (xy -2.197162 1.942941) (xy -2.186116 2.315242) (xy -2.171505 2.660109)
-     (xy -2.153148 2.981240) (xy -2.130863 3.282338) (xy -2.104469 3.567102) (xy -2.073784 3.839233) (xy -2.041104 4.085167) (xy -2.015574 4.259812) (xy -1.993120 4.398602) (xy -1.971631 4.507693)
-     (xy -1.948998 4.593245) (xy -1.923111 4.661416) (xy -1.891861 4.718365) (xy -1.853138 4.770249) (xy -1.804832 4.823228) (xy -1.779428 4.849044) (xy -1.618841 4.984320) (xy -1.447299 5.080189)
-     (xy -1.267342 5.135987) (xy -1.081511 5.151056) (xy -0.892346 5.124735) (xy -0.811364 5.100785) (xy -0.665911 5.033126) (xy -0.527447 4.936004) (xy -0.451887 4.865063) (xy -0.385191 4.794250)
-     (xy -0.361587 4.212167) (xy -0.349443 3.939921) (xy -0.336282 3.706471) (xy -0.321393 3.508279) (xy -0.304064 3.341810) (xy -0.283580 3.203525) (xy -0.259231 3.089889) (xy -0.230303 2.997365)
-     (xy -0.196085 2.922415) (xy -0.155863 2.861504) (xy -0.108924 2.811094) (xy -0.073344 2.781418) (xy -0.013818 2.743898) (xy 0.051577 2.723037) (xy 0.138640 2.713095) (xy 0.188279 2.711606)
-     (xy 0.239532 2.714582) (xy 0.299073 2.723432) (xy 0.373574 2.739568) (xy 0.469707 2.764399) (xy 0.594145 2.799337) (xy 0.720601 2.836110) (xy 0.982819 2.910747) (xy 1.211185 2.970189)
-     (xy 1.411156 3.014956) (xy 1.588189 3.045567) (xy 1.747741 3.062542) (xy 1.895268 3.066400) (xy 2.036227 3.057661) (xy 2.176075 3.036845) (xy 2.320269 3.004470) (xy 2.364888 2.992664)
-     (xy 2.412026 2.979817) (xy 2.377809 3.080240) (xy 2.308726 3.219183) (xy 2.204080 3.342019) (xy 2.068845 3.444835) (xy 1.907996 3.523719) (xy 1.756834 3.568602) (xy 1.676719 3.588561)
-     (xy 1.611224 3.609446) (xy 1.572915 3.627172) (xy 1.570334 3.629264) (xy 1.549059 3.671389) (xy 1.533129 3.747310) (xy 1.522592 3.848823) (xy 1.517495 3.967724) (xy 1.517887 4.095809)
-     (xy 1.523815 4.224874) (xy 1.535327 4.346715) (xy 1.552472 4.453126) (xy 1.565222 4.505260) (xy 1.587765 4.567218) (xy 1.619065 4.609629) (xy 1.669408 4.641175) (xy 1.749084 4.670544)
-     (xy 1.768074 4.676497) (xy 1.922647 4.715364) (xy 2.083221 4.739964) (xy 2.243644 4.750842) (xy 2.397765 4.748546) (xy 2.539431 4.733622) (xy 2.662492 4.706616) (xy 2.760797 4.668075)
-     (xy 2.828194 4.618545) (xy 2.852742 4.580140) (xy 2.865599 4.533702) (xy 2.883229 4.449706) (xy 2.904971 4.332577) (xy 2.930163 4.186741) (xy 2.958145 4.016623) (xy 2.988257 3.826649)
-     (xy 3.019837 3.621243) (xy 3.052225 3.404831) (xy 3.084759 3.181839) (xy 3.116780 2.956691) (xy 3.147626 2.733813) (xy 3.176637 2.517630) (xy 3.203151 2.312568) (xy 3.226508 2.123052)
-     (xy 3.246047 1.953507) (xy 3.249016 1.926298) (xy 3.272096 1.669384) (xy 3.289914 1.378393) (xy 3.302257 1.061282) (xy 3.308911 0.726005) (xy 3.309664 0.380517) (xy 3.304302 0.032774)
-     (xy 3.302056 -0.051014) (xy 3.297045 -0.212868) (xy 3.291896 -0.360721) (xy 3.286835 -0.489368) (xy 3.282088 -0.593603) (xy 3.277882 -0.668222) (xy 3.274443 -0.708019) (xy 3.273231 -0.713158)
-     (xy 3.250434 -0.710915) (xy 3.195848 -0.697444) (xy 3.117811 -0.674993) (xy 3.030759 -0.647786) (xy 2.700912 -0.555809) (xy 2.360599 -0.488464) (xy 2.015881 -0.445765) (xy 1.672822 -0.427729)
-     (xy 1.337483 -0.434370) (xy 1.015927 -0.465704) (xy 0.714218 -0.521746) (xy 0.438416 -0.602513) (xy 0.338667 -0.640931) (xy 0.137075 -0.734062) (xy -0.034381 -0.835534) (xy -0.187894 -0.953235)
-     (xy -0.288103 -1.046415) (xy -0.377418 -1.139339) (xy -0.443583 -1.220017) (xy -0.496778 -1.302301) (xy -0.545730 -1.397000) (xy -0.653368 -1.664900) (xy -0.731804 -1.952140) (xy -0.779044 -2.247564)
-     (xy -0.793092 -2.540022) (xy -0.789152 -2.614465) (xy -0.116403 -2.614465) (xy -0.114716 -2.376766) (xy -0.076993 -2.127790) (xy -0.003336 -1.871011) (xy 0.025830 -1.792778) (xy 0.092921 -1.653890)
-     (xy 0.179057 -1.536161) (xy 0.289140 -1.435707) (xy 0.428071 -1.348648) (xy 0.600753 -1.271099) (xy 0.751417 -1.218110) (xy 1.003628 -1.153361) (xy 1.276329 -1.115411) (xy 1.573725 -1.103921)
-     (xy 1.900024 -1.118550) (xy 1.940956 -1.122012) (xy 2.246977 -1.159810) (xy 2.538763 -1.216905) (xy 2.812934 -1.291703) (xy 3.066109 -1.382616) (xy 3.294909 -1.488051) (xy 3.495953 -1.606417)
-     (xy 3.665859 -1.736125) (xy 3.801249 -1.875582) (xy 3.898741 -2.023197) (xy 3.911520 -2.049459) (xy 3.957166 -2.197480) (xy 3.966494 -2.358850) (xy 3.941097 -2.528085) (xy 3.882569 -2.699700)
-     (xy 3.792505 -2.868209) (xy 3.672497 -3.028128) (xy 3.606783 -3.098186) (xy 3.502297 -3.189820) (xy 3.371974 -3.285836) (xy 3.230024 -3.376895) (xy 3.090659 -3.453656) (xy 3.008701 -3.491249)
-     (xy 2.712594 -3.590842) (xy 2.395555 -3.654401) (xy 2.058845 -3.681943) (xy 1.703721 -3.673485) (xy 1.331445 -3.629043) (xy 0.943275 -3.548635) (xy 0.624417 -3.459134) (xy 0.459316 -3.405731)
-     (xy 0.329507 -3.358180) (xy 0.229083 -3.312606) (xy 0.152135 -3.265133) (xy 0.092754 -3.211885) (xy 0.045034 -3.148987) (xy 0.003065 -3.072562) (xy -0.011254 -3.042129) (xy -0.081950 -2.837411)
-     (xy -0.116403 -2.614465) (xy -0.789152 -2.614465) (xy -0.783290 -2.725208) (xy -0.761761 -2.898479) (xy -0.731317 -3.046088) (xy -0.687352 -3.184486) (xy -0.625258 -3.330127) (xy -0.598157 -3.386329)
-     (xy -0.531912 -3.509646) (xy -0.463457 -3.610339) (xy -0.379842 -3.706730) (xy -0.350083 -3.737329) (xy -0.288686 -3.798183) (xy -0.238334 -3.843046) (xy -0.189218 -3.877713) (xy -0.131528 -3.907977)
-     (xy -0.055453 -3.939635) (xy 0.048815 -3.978480) (xy 0.073224 -3.987370) (xy 0.459907 -4.117693) (xy 0.824480 -4.218434) (xy 1.173856 -4.290825) (xy 1.514953 -4.336100) (xy 1.854686 -4.355491)
-     (xy 2.125825 -4.353349) (xy 2.484233 -4.340808) (xy 2.348075 -4.479070) (xy 2.131335 -4.672876) (xy 1.897604 -4.832689) (xy 1.651564 -4.955733) (xy 1.407584 -5.036822) (xy 1.255337 -5.066641)
-     (xy 1.070052 -5.089135) (xy 0.859299 -5.104458) (xy 0.630646 -5.112765) (xy 0.391661 -5.114211) (xy 0.149914 -5.108951) (xy -0.087028 -5.097139) (xy -0.311595 -5.078931) (xy -0.516219 -5.054481)
-     (xy -0.693330 -5.023945) (xy -0.823666 -4.991166) (xy -0.996687 -4.927326) (xy -1.154153 -4.846163) (xy -1.296915 -4.745715) (xy -1.425825 -4.624018) (xy -1.541736 -4.479108) (xy -1.645500 -4.309022)
-     (xy -1.737969 -4.111795) (xy -1.819995 -3.885465) (xy -1.892430 -3.628067) (xy -1.956126 -3.337637) (xy -2.011935 -3.012213) (xy -2.060710 -2.649830) (xy -2.103303 -2.248525) (xy -2.126128 -1.989666)
-     (xy -2.143284 -1.775859) (xy -2.158017 -1.578173) (xy -2.170503 -1.391179) (xy -2.180916 -1.209448) (xy -2.189433 -1.027551) (xy -2.196229 -0.840059) (xy -2.201481 -0.641542) (xy -2.205363 -0.426573)
-     (xy -2.208051 -0.189721) (xy -2.209722 0.074443) (xy -2.210551 0.371347) (xy -2.210725 0.624417) (xy -2.893003 0.624417) (xy -2.892085 0.275302) (xy -2.886355 -0.169707) (xy -2.876209 -0.604344)
-     (xy -2.861790 -1.020104) (xy -2.843239 -1.408482) (xy -2.827010 -1.672166) (xy -2.818867 -1.805449) (xy -2.813658 -1.921562) (xy -2.811525 -2.014268) (xy -2.812610 -2.077333) (xy -2.817057 -2.104519)
-     (xy -2.817131 -2.104601) (xy -2.849074 -2.115716) (xy -2.913285 -2.122327) (xy -2.999967 -2.124693) (xy -3.099322 -2.123071) (xy -3.201555 -2.117722) (xy -3.296867 -2.108901) (xy -3.375462 -2.096869)
-     (xy -3.407833 -2.089029) (xy -3.511758 -2.048736) (xy -3.590965 -1.993327) (xy -3.650753 -1.915995) (xy -3.696421 -1.809936) (xy -3.732457 -1.672166) (xy -3.782095 -1.408779) (xy -3.826565 -1.111561)
-     (xy -3.865285 -0.788765) (xy -3.897676 -0.448645) (xy -3.923156 -0.099453) (xy -3.941145 0.250557) (xy -3.951062 0.593133) (xy -3.952326 0.920021) (xy -4.631912 0.920021) (xy -4.633387 0.844110)
-     (xy -4.625538 0.377182) (xy -4.613835 0.095250) (xy -4.593519 -0.249592) (xy -4.567887 -0.579312) (xy -4.537430 -0.890638) (xy -4.502641 -1.180299) (xy -4.464011 -1.445021) (xy -4.422033 -1.681533)
-     (xy -4.377199 -1.886562) (xy -4.330000 -2.056836) (xy -4.280929 -2.189083) (xy -4.265386 -2.221902) (xy -4.159729 -2.384362) (xy -4.020734 -2.523600) (xy -3.852376 -2.636392) (xy -3.658634 -2.719510)
-     (xy -3.647921 -2.722966) (xy -3.579733 -2.743287) (xy -3.518439 -2.757253) (xy -3.453813 -2.765863) (xy -3.375627 -2.770115) (xy -3.273653 -2.771006) (xy -3.166507 -2.769950) (xy -3.019207 -2.769507)
-     (xy -2.910768 -2.772937) (xy -2.837878 -2.780438) (xy -2.797500 -2.792059) (xy -2.751597 -2.832928) (xy -2.715457 -2.903199) (xy -2.687683 -3.006865) (xy -2.666879 -3.147919) (xy -2.664216 -3.173111)
-     (xy -2.621057 -3.479792) (xy -2.554863 -3.786821) (xy -2.468347 -4.085987) (xy -2.364221 -4.369082) (xy -2.245195 -4.627894) (xy -2.113983 -4.854214) (xy -2.103950 -4.869316) (xy -2.045814 -4.946914)
-     (xy -1.967457 -5.039253) (xy -1.880461 -5.133132) (xy -1.818376 -5.194836) (xy -1.724192 -5.281100) (xy -1.641221 -5.347431) (xy -1.554767 -5.404014) (xy -1.450134 -5.461036) (xy -1.393077 -5.489615)
-     (xy -1.247147 -5.555903) (xy -1.097720 -5.611561) (xy -0.938415 -5.657976) (xy -0.762851 -5.696533) (xy -0.564646 -5.728617) (xy -0.337420 -5.755614) (xy -0.074791 -5.778909) (xy -0.052916 -5.780590)
-     (xy 0.128802 -5.790338) (xy 0.333701 -5.794469) (xy 0.550560 -5.793279) )(layer B.SilkS) (width  0.010000)
-  )
-)

pcb/footprints/amongy.kicad_mod

@@ -1,488 +0,0 @@
-(footprint "amongy" (version 20211014) (generator pcbnew)
-  (layer "F.Cu")
-  (tedit 62523FF7)
-  (attr through_hole)
-  (fp_text reference "Ref**" (at 0 0) (layer "F.SilkS") hide
-    (effects (font (size 1.27 1.27) (thickness 0.15)))
-    (tstamp 87e5e1fd-9717-4766-bfd9-557231a36ff3)
-  )
-  (fp_text value "Val**" (at 0 0) (layer "F.SilkS") hide
-    (effects (font (size 1.27 1.27) (thickness 0.15)))
-    (tstamp 308df684-201a-4b84-839a-6b6e9ca2a6f7)
-  )
-  (fp_poly (pts
-      (xy -0.599515 -3.960737)
-      (xy -0.817558 -3.940271)
-      (xy -1.009259 -3.9087)
-      (xy -1.111561 -3.8834)
-      (xy -1.342248 -3.802953)
-      (xy -1.547879 -3.700739)
-      (xy -1.734411 -3.572279)
-      (xy -1.907801 -3.413096)
-      (xy -2.074006 -3.218711)
-      (xy -2.169359 -3.088221)
-      (xy -2.234755 -3.002894)
-      (xy -2.327087 -2.895225)
-      (xy -2.441388 -2.770702)
-      (xy -2.572693 -2.634811)
-      (xy -2.646355 -2.561167)
-      (xy -2.768376 -2.43941)
-      (xy -2.863273 -2.341689)
-      (xy -2.935077 -2.263378)
-      (xy -2.987819 -2.199853)
-      (xy -3.025531 -2.14649)
-      (xy -3.052245 -2.098664)
-      (xy -3.05547 -2.09186)
-      (xy -3.134112 -1.880478)
-      (xy -3.170985 -1.675851)
-      (xy -3.166201 -1.478547)
-      (xy -3.11987 -1.289131)
-      (xy -3.032101 -1.10817)
-      (xy -2.903005 -0.93623)
-      (xy -2.812424 -0.843836)
-      (xy -2.685005 -0.724589)
-      (xy -2.70132 -0.494586)
-      (xy -2.708045 -0.368903)
-      (xy -2.712973 -0.212547)
-      (xy -2.716149 -0.033419)
-      (xy -2.71762 0.160585)
-      (xy -2.717433 0.361564)
-      (xy -2.715634 0.56162)
-      (xy -2.712271 0.752855)
-      (xy -2.707391 0.927369)
-      (xy -2.701039 1.077264)
-      (xy -2.693263 1.194641)
-      (xy -2.691191 1.217083)
-      (xy -2.674623 1.370302)
-      (xy -2.65237 1.556124)
-      (xy -2.625692 1.765391)
-      (xy -2.595851 1.988948)
-      (xy -2.564107 2.217636)
-      (xy -2.531723 2.442299)
-      (xy -2.499958 2.65378)
-      (xy -2.470075 2.842923)
-      (xy -2.453855 2.940229)
-      (xy -2.423969 3.104634)
-      (xy -2.395537 3.233374)
-      (xy -2.365858 3.332913)
-      (xy -2.33223 3.409716)
-      (xy -2.291951 3.470245)
-      (xy -2.242322 3.520966)
-      (xy -2.195897 3.557504)
-      (xy -2.128765 3.597047)
-      (xy -2.040925 3.63701)
-      (xy -1.962538 3.665096)
-      (xy -1.896401 3.68347)
-      (xy -1.83505 3.695312)
-      (xy -1.767602 3.701454)
-      (xy -1.683169 3.702729)
-      (xy -1.570868 3.699969)
-      (xy -1.52735 3.698373)
-      (xy -1.299174 3.68095)
-      (xy -1.107889 3.646079)
-      (xy -0.950815 3.591351)
-      (xy -0.825274 3.51436)
-      (xy -0.728585 3.412699)
-      (xy -0.658068 3.283962)
-      (xy -0.611045 3.12574)
-      (xy -0.584835 2.935628)
-      (xy -0.579441 2.846916)
-      (xy -0.572741 2.70535)
-      (xy -0.564546 2.599772)
-      (xy -0.55209 2.523857)
-      (xy -0.532607 2.471277)
-      (xy -0.503329 2.435708)
-      (xy -0.461491 2.410823)
-      (xy -0.404326 2.390296)
-      (xy -0.376004 2.381727)
-      (xy -0.308608 2.364273)
-      (xy -0.270252 2.362265)
-      (xy -0.250751 2.375232)
-      (xy -0.250312 2.375907)
-      (xy -0.244784 2.404905)
-      (xy -0.239939 2.4688)
-      (xy -0.236104 2.560156)
-      (xy -0.233608 2.671538)
-      (xy -0.232789 2.772833)
-      (xy -0.229546 2.972352)
-      (xy -0.220043 3.136131)
-      (xy -0.203393 3.270424)
-      (xy -0.178706 3.381481)
-      (xy -0.145093 3.475555)
-      (xy -0.127699 3.512296)
-      (xy -0.042414 3.63544)
-      (xy 0.076531 3.743638)
-      (xy 0.22223 3.834042)
-      (xy 0.387776 3.903805)
-      (xy 0.566262 3.95008)
-      (xy 0.75078 3.970021)
-      (xy 0.934426 3.96078)
-      (xy 0.953546 3.957974)
-      (xy 1.143022 3.910072)
-      (xy 1.320344 3.830086)
-      (xy 1.479036 3.722759)
-      (xy 1.612618 3.592834)
-      (xy 1.714615 3.445051)
-      (xy 1.747279 3.376886)
-      (xy 1.77382 3.29699)
-      (xy 1.80191 3.183874)
-      (xy 1.829823 3.046522)
-      (xy 1.855833 2.89392)
-      (xy 1.878215 2.735054)
-      (xy 1.889732 2.63525)
-      (xy 1.916285 2.38125)
-      (xy 2.1055 2.356322)
-      (xy 2.254325 2.33387)
-      (xy 2.373988 2.308317)
-      (xy 2.477657 2.276048)
-      (xy 2.578503 2.23345)
-      (xy 2.61147 2.217473)
-      (xy 2.77326 2.115974)
-      (xy 2.903799 1.987199)
-      (xy 3.003975 1.829909)
-      (xy 3.074674 1.642866)
-      (xy 3.099863 1.534583)
-      (xy 3.133713 1.310405)
-      (xy 3.157251 1.052731)
-      (xy 3.170681 0.76907)
-      (xy 3.171646 0.686413)
-      (xy 2.700151 0.686413)
-      (xy 2.694646 0.916425)
-      (xy 2.682543 1.120797)
-      (xy 2.663501 1.292013)
-      (xy 2.660355 1.312333)
-      (xy 2.633437 1.456804)
-      (xy 2.602838 1.566554)
-      (xy 2.564303 1.649191)
-      (xy 2.513582 1.712324)
-      (xy 2.446421 1.763561)
-      (xy 2.390731 1.794706)
-      (xy 2.254361 1.85034)
-      (xy 2.117402 1.881885)
-      (xy 2.116667 1.88198)
-      (xy 2.043184 1.891446)
-      (xy 1.986474 1.898823)
-      (xy 1.960261 1.902315)
-      (xy 1.952093 1.885009)
-      (xy 1.951358 1.837373)
-      (xy 1.955321 1.793875)
-      (xy 1.962237 1.714823)
-      (xy 1.968275 1.598879)
-      (xy 1.973408 1.451478)
-      (xy 1.977609 1.278051)
-      (xy 1.980852 1.084034)
-      (xy 1.983109 0.874858)
-      (xy 1.984355 0.655958)
-      (xy 1.984562 0.432767)
-      (xy 1.983807 0.237581)
-      (xy 1.523591 0.237581)
-      (xy 1.523086 0.542236)
-      (xy 1.519133 0.847661)
-      (xy 1.511918 1.150177)
-      (xy 1.501626 1.446107)
-      (xy 1.488442 1.731775)
-      (xy 1.472553 2.003502)
-      (xy 1.454142 2.257612)
-      (xy 1.433397 2.490427)
-      (xy 1.410501 2.69827)
-      (xy 1.385641 2.877464)
-      (xy 1.359002 3.024332)
-      (xy 1.33077 3.135196)
-      (xy 1.309677 3.190415)
-      (xy 1.245567 3.283059)
-      (xy 1.148956 3.370392)
-      (xy 1.029623 3.444953)
-      (xy 0.910304 3.495159)
-      (xy 0.824742 3.508489)
-      (xy 0.718407 3.504169)
-      (xy 0.607998 3.48425)
-      (xy 0.510209 3.450782)
-      (xy 0.497005 3.444386)
-      (xy 0.424208 3.401126)
-      (xy 0.357545 3.351535)
-      (xy 0.331987 3.327824)
-      (xy 0.27239 3.265034)
-      (xy 0.253839 2.822987)
-      (xy 0.243629 2.608828)
-      (xy 0.232069 2.432472)
-      (xy 0.218233 2.289389)
-      (xy 0.201195 2.17505)
-      (xy 0.180027 2.084928)
-      (xy 0.153804 2.014493)
-      (xy 0.121599 1.959216)
-      (xy 0.082485 1.914569)
-      (xy 0.064755 1.89872)
-      (xy 0.01155 1.864193)
-      (xy -0.051092 1.845967)
-      (xy -0.129631 1.844248)
-      (xy -0.230522 1.859239)
-      (xy -0.360224 1.891146)
-      (xy -0.442317 1.914825)
-      (xy -0.688359 1.984157)
-      (xy -0.900848 2.034753)
-      (xy -1.083924 2.067151)
-      (xy -1.241728 2.081886)
-      (xy -1.378398 2.079496)
-      (xy -1.498074 2.060518)
-      (xy -1.520844 2.054638)
-      (xy -1.57824 2.041509)
-      (xy -1.616474 2.03781)
-      (xy -1.623496 2.039773)
-      (xy -1.624531 2.064807)
-      (xy -1.613377 2.112627)
-      (xy -1.610446 2.121858)
-      (xy -1.561013 2.211478)
-      (xy -1.478235 2.295661)
-      (xy -1.371087 2.367983)
-      (xy -1.248545 2.422018)
-      (xy -1.158301 2.44554)
-      (xy -1.093001 2.468566)
-      (xy -1.05531 2.503314)
-      (xy -1.046004 2.544066)
-      (xy -1.040855 2.616196)
-      (xy -1.039513 2.708991)
-      (xy -1.041625 2.811736)
-      (xy -1.046841 2.913718)
-      (xy -1.054809 3.004222)
-      (xy -1.065178 3.072534)
-      (xy -1.075008 3.104085)
-      (xy -1.119912 3.147043)
-      (xy -1.1976 3.182096)
-      (xy -1.299165 3.208679)
-      (xy -1.415699 3.226228)
-      (xy -1.538295 3.234178)
-      (xy -1.658045 3.231964)
-      (xy -1.766041 3.219023)
-      (xy -1.853377 3.194791)
-      (xy -1.911144 3.158701)
-      (xy -1.912576 3.157155)
-      (xy -1.928978 3.122343)
-      (xy -1.948992 3.049787)
-      (xy -1.972745 2.938782)
-      (xy -2.000367 2.788622)
-      (xy -2.031985 2.598604)
-      (xy -2.067729 2.368019)
-      (xy -2.107726 2.096165)
-      (xy -2.115417 2.042583)
-      (xy -2.149524 1.799797)
-      (xy -2.177254 1.590038)
-      (xy -2.19924 1.404586)
-      (xy -2.216116 1.23472)
-      (xy -2.228516 1.071718)
-      (xy -2.237073 0.90686)
-      (xy -2.242421 0.731425)
-      (xy -2.245196 0.536691)
-      (xy -2.246029 0.313938)
-      (xy -2.246001 0.245969)
-      (xy -2.245504 0.075924)
-      (xy -2.244436 -0.080374)
-      (xy -2.242878 -0.217953)
-      (xy -2.240913 -0.331843)
-      (xy -2.238621 -0.417074)
-      (xy -2.236085 -0.468676)
-      (xy -2.234067 -0.482321)
-      (xy -2.210212 -0.481601)
-      (xy -2.155626 -0.470329)
-      (xy -2.079963 -0.450661)
-      (xy -2.037486 -0.438424)
-      (xy -1.879357 -0.393237)
-      (xy -1.743792 -0.359568)
-      (xy -1.619268 -0.335859)
-      (xy -1.494262 -0.320552)
-      (xy -1.357251 -0.312089)
-      (xy -1.19671 -0.308912)
-      (xy -1.0795 -0.308918)
-      (xy -0.93137 -0.310112)
-      (xy -0.816663 -0.312611)
-      (xy -0.726472 -0.317235)
-      (xy -0.65189 -0.324803)
-      (xy -0.584009 -0.336131)
-      (xy -0.513921 -0.352041)
-      (xy -0.460928 -0.365767)
-      (xy -0.220192 -0.445334)
-      (xy -0.014532 -0.547109)
-      (xy 0.157057 -0.672445)
-      (xy 0.295577 -0.822695)
-      (xy 0.402032 -0.999213)
-      (xy 0.477426 -1.203352)
-      (xy 0.522761 -1.436466)
-      (xy 0.534801 -1.631284)
-      (xy 0.08085 -1.631284)
-      (xy 0.059731 -1.47531)
-      (xy 0.054042 -1.449733)
-      (xy 0.006978 -1.285688)
-      (xy -0.050349 -1.156985)
-      (xy -0.122283 -1.057049)
-      (xy -0.213168 -0.979305)
-      (xy -0.284241 -0.93767)
-      (xy -0.479373 -0.853899)
-      (xy -0.684766 -0.797979)
-      (xy -0.90667 -0.769045)
-      (xy -1.151336 -0.766235)
-      (xy -1.391029 -0.784751)
-      (xy -1.625346 -0.821532)
-      (xy -1.85217 -0.877486)
-      (xy -2.064071 -0.949834)
-      (xy -2.253621 -1.035799)
-      (xy -2.413389 -1.132604)
-      (xy -2.494876 -1.197428)
-      (xy -2.604239 -1.314233)
-      (xy -2.67252 -1.433016)
-      (xy -2.700918 -1.557801)
-      (xy -2.690635 -1.69261)
-      (xy -2.667666 -1.776245)
-      (xy -2.593701 -1.944322)
-      (xy -2.491429 -2.086679)
-      (xy -2.397407 -2.178351)
-      (xy -2.301968 -2.2481)
-      (xy -2.179577 -2.319873)
-      (xy -2.044579 -2.386393)
-      (xy -1.911319 -2.440382)
-      (xy -1.830916 -2.465716)
-      (xy -1.726068 -2.486352)
-      (xy -1.591694 -2.501783)
-      (xy -1.440341 -2.511508)
-      (xy -1.284555 -2.515027)
-      (xy -1.136882 -2.51184)
-      (xy -1.009868 -2.501445)
-      (xy -0.992789 -2.49915)
-      (xy -0.850564 -2.474867)
-      (xy -0.699464 -2.442353)
-      (xy -0.547849 -2.404042)
-      (xy -0.404078 -2.362369)
-      (xy -0.276512 -2.319766)
-      (xy -0.17351 -2.278668)
-      (xy -0.103433 -2.241509)
-      (xy -0.100222 -2.239291)
-      (xy -0.030877 -2.166661)
-      (xy 0.023431 -2.061728)
-      (xy 0.061172 -1.93231)
-      (xy 0.080821 -1.786223)
-      (xy 0.08085 -1.631284)
-      (xy 0.534801 -1.631284)
-      (xy 0.539042 -1.699907)
-      (xy 0.539113 -1.7145)
-      (xy 0.533754 -1.901291)
-      (xy 0.515054 -2.057075)
-      (xy 0.480459 -2.191779)
-      (xy 0.427412 -2.315335)
-      (xy 0.353357 -2.437671)
-      (xy 0.352709 -2.438619)
-      (xy 0.29274 -2.519194)
-      (xy 0.230971 -2.583871)
-      (xy 0.159371 -2.637831)
-      (xy 0.06991 -2.686255)
-      (xy -0.045445 -2.734323)
-      (xy -0.179916 -2.7822)
-      (xy -0.378542 -2.84686)
-      (xy -0.551036 -2.895554)
-      (xy -0.709558 -2.930356)
-      (xy -0.86627 -2.953345)
-      (xy -1.033336 -2.966598)
-      (xy -1.222916 -2.972191)
-      (xy -1.29551 -2.972719)
-      (xy -1.691437 -2.973917)
-      (xy -1.61301 -3.055283)
-      (xy -1.434495 -3.211024)
-      (xy -1.231359 -3.335953)
-      (xy -1.011572 -3.425667)
-      (xy -0.88181 -3.459377)
-      (xy -0.785315 -3.473377)
-      (xy -0.655809 -3.483588)
-      (xy -0.502446 -3.490005)
-      (xy -0.334377 -3.492622)
-      (xy -0.160758 -3.491432)
-      (xy 0.00926 -3.486429)
-      (xy 0.166523 -3.477609)
-      (xy 0.301878 -3.464965)
-      (xy 0.338667 -3.460167)
-      (xy 0.497001 -3.430167)
-      (xy 0.640222 -3.386015)
-      (xy 0.769159 -3.325699)
-      (xy 0.88464 -3.24721)
-      (xy 0.987494 -3.148536)
-      (xy 1.07855 -3.027667)
-      (xy 1.158634 -2.882591)
-      (xy 1.228577 -2.711299)
-      (xy 1.289206 -2.511778)
-      (xy 1.34135 -2.28202)
-      (xy 1.385836 -2.020012)
-      (xy 1.423495 -1.723744)
-      (xy 1.455153 -1.391205)
-      (xy 1.481639 -1.020385)
-      (xy 1.502566 -0.635)
-      (xy 1.513516 -0.354715)
-      (xy 1.520463 -0.062629)
-      (xy 1.523591 0.237581)
-      (xy 1.983807 0.237581)
-      (xy 1.983703 0.210717)
-      (xy 1.981752 -0.004757)
-      (xy 1.978682 -0.208222)
-      (xy 1.974466 -0.394245)
-      (xy 1.969078 -0.557393)
-      (xy 1.96713 -0.60325)
-      (xy 1.95978 -0.768651)
-      (xy 1.953069 -0.925234)
-      (xy 1.947251 -1.066624)
-      (xy 1.942579 -1.186441)
-      (xy 1.939309 -1.27831)
-      (xy 1.937695 -1.335854)
-      (xy 1.937581 -1.344084)
-      (xy 1.93675 -1.449917)
-      (xy 2.12725 -1.448221)
-      (xy 2.264482 -1.440896)
-      (xy 2.367245 -1.418866)
-      (xy 2.442098 -1.377863)
-      (xy 2.495598 -1.313622)
-      (xy 2.534304 -1.221875)
-      (xy 2.547564 -1.17475)
-      (xy 2.582573 -1.010208)
-      (xy 2.61371 -0.811174)
-      (xy 2.640636 -0.585167)
-      (xy 2.663008 -0.339702)
-      (xy 2.680487 -0.082295)
-      (xy 2.692731 0.179537)
-      (xy 2.699399 0.438279)
-      (xy 2.700151 0.686413)
-      (xy 3.171646 0.686413)
-      (xy 3.174212 0.466931)
-      (xy 3.168051 0.153823)
-      (xy 3.152403 -0.162745)
-      (xy 3.127476 -0.475262)
-      (xy 3.093477 -0.776222)
-      (xy 3.050613 -1.058113)
-      (xy 3.024635 -1.195917)
-      (xy 2.991659 -1.341357)
-      (xy 2.957093 -1.454159)
-      (xy 2.917 -1.543951)
-      (xy 2.867444 -1.620365)
-      (xy 2.834993 -1.659877)
-      (xy 2.734268 -1.756568)
-      (xy 2.621916 -1.826812)
-      (xy 2.490869 -1.873212)
-      (xy 2.334062 -1.898369)
-      (xy 2.169094 -1.905)
-      (xy 2.051849 -1.906143)
-      (xy 1.96913 -1.913839)
-      (xy 1.913675 -1.934496)
-      (xy 1.878222 -1.974519)
-      (xy 1.855511 -2.040312)
-      (xy 1.838279 -2.138283)
-      (xy 1.828936 -2.205067)
-      (xy 1.772972 -2.516767)
-      (xy 1.694338 -2.806544)
-      (xy 1.594837 -3.068799)
-      (xy 1.47808 -3.294934)
-      (xy 1.354836 -3.460168)
-      (xy 1.198003 -3.606426)
-      (xy 1.013573 -3.729738)
-      (xy 0.807539 -3.826137)
-      (xy 0.585896 -3.891655)
-      (xy 0.572601 -3.894442)
-      (xy 0.357091 -3.93038)
-      (xy 0.123174 -3.95492)
-      (xy -0.120199 -3.96812)
-      (xy -0.364078 -3.97004)
-      (xy -0.599515 -3.960737)
-    ) (layer "B.Cu") (width 0.01) (fill solid) (tstamp 1ee29550-b4b5-484b-9263-e721db811d4d))
-)

pcb/footprints/dark_logotype_horizontal.kicad_mod

@@ -0,0 +1,190 @@
+(module "dark_logotype_horizontal" (layer F.Cu)
+(fp_text reference Ref** (at 0 0) (layer F.SilkS) hide
+(effects (font (size 1.27 1.27) (thickness 0.15)))
+)
+(fp_text value Val** (at 0 0) (layer F.SilkS) hide
+(effects (font (size 1.27 1.27) (thickness 0.15)))
+)
+  (fp_poly (pts (xy 9.732408 -0.722874) (xy 9.732388 -0.650594) (xy 9.732331 -0.586272) (xy 9.732231 -0.529398) (xy 9.732081 -0.479464) (xy 9.731874 -0.435960) (xy 9.731603 -0.398378) (xy 9.731261 -0.366208)
+     (xy 9.730842 -0.338942) (xy 9.730338 -0.316069) (xy 9.729744 -0.297082) (xy 9.729051 -0.281472) (xy 9.728254 -0.268728) (xy 9.727345 -0.258343) (xy 9.726317 -0.249807) (xy 9.726026 -0.247807)
+     (xy 9.712728 -0.183098) (xy 9.693101 -0.123951) (xy 9.666998 -0.070142) (xy 9.634270 -0.021446) (xy 9.594769 0.022360) (xy 9.548348 0.061502) (xy 9.501717 0.092231) (xy 9.467001 0.110259)
+     (xy 9.425853 0.127636) (xy 9.380306 0.143708) (xy 9.332395 0.157820) (xy 9.284153 0.169316) (xy 9.237615 0.177543) (xy 9.236075 0.177759) (xy 9.199033 0.182907) (xy 9.199033 2.053103)
+     (xy 9.465890 2.054193) (xy 9.732746 2.055283) (xy 9.331997 2.498725) (xy 9.284753 2.550981) (xy 9.239056 2.601485) (xy 9.195229 2.649883) (xy 9.153593 2.695821) (xy 9.114471 2.738945)
+     (xy 9.078185 2.778900) (xy 9.045058 2.815332) (xy 9.015411 2.847887) (xy 8.989567 2.876211) (xy 8.967848 2.899949) (xy 8.950576 2.918749) (xy 8.938073 2.932254) (xy 8.930662 2.940112)
+     (xy 8.928616 2.942094) (xy 8.925518 2.939002) (xy 8.917071 2.929979) (xy 8.903600 2.915381) (xy 8.885427 2.895564) (xy 8.862875 2.870883) (xy 8.836268 2.841694) (xy 8.805929 2.808352)
+     (xy 8.772182 2.771213) (xy 8.735350 2.730632) (xy 8.695757 2.686966) (xy 8.653725 2.640569) (xy 8.609578 2.591797) (xy 8.563639 2.541006) (xy 8.528050 2.501630) (xy 8.480965 2.449505)
+     (xy 8.435447 2.399079) (xy 8.391817 2.350712) (xy 8.350398 2.304763) (xy 8.311514 2.261591) (xy 8.275486 2.221555) (xy 8.242638 2.185015) (xy 8.213293 2.152329) (xy 8.187773 2.123858)
+     (xy 8.166400 2.099959) (xy 8.149498 2.080993) (xy 8.137390 2.067319) (xy 8.130398 2.059295) (xy 8.128705 2.057202) (xy 8.132570 2.056344) (xy 8.144585 2.055578) (xy 8.164433 2.054908)
+     (xy 8.191798 2.054340) (xy 8.226363 2.053877) (xy 8.267813 2.053527) (xy 8.315831 2.053291) (xy 8.370100 2.053177) (xy 8.394347 2.053166) (xy 8.661400 2.053166) (xy 8.661400 0.182416)
+     (xy 8.645525 0.179883) (xy 8.634618 0.178016) (xy 8.618013 0.175024) (xy 8.598323 0.171382) (xy 8.585200 0.168910) (xy 8.510538 0.151485) (xy 8.442489 0.128826) (xy 8.381072 0.100954)
+     (xy 8.326305 0.067887) (xy 8.278208 0.029645) (xy 8.236800 -0.013754) (xy 8.202100 -0.062291) (xy 8.174127 -0.115946) (xy 8.152900 -0.174701) (xy 8.138437 -0.238536) (xy 8.132551 -0.284039)
+     (xy 8.131731 -0.297354) (xy 8.130984 -0.318821) (xy 8.130313 -0.348125) (xy 8.129722 -0.384949) (xy 8.129213 -0.428980) (xy 8.128790 -0.479902) (xy 8.128455 -0.537400) (xy 8.128212 -0.601159)
+     (xy 8.128064 -0.670865) (xy 8.128014 -0.744009) (xy 8.128000 -1.155701) (xy 8.665400 -1.155701) (xy 8.666575 -0.729192) (xy 8.667750 -0.302684) (xy 8.679092 -0.271634) (xy 8.696256 -0.232319)
+     (xy 8.717476 -0.198499) (xy 8.744305 -0.167646) (xy 8.779970 -0.137498) (xy 8.819025 -0.114579) (xy 8.860537 -0.098911) (xy 8.903571 -0.090517) (xy 8.947192 -0.089420) (xy 8.990465 -0.095641)
+     (xy 9.032456 -0.109203) (xy 9.072231 -0.130129) (xy 9.108855 -0.158441) (xy 9.109315 -0.158866) (xy 9.139007 -0.189843) (xy 9.161972 -0.222123) (xy 9.179884 -0.258087) (xy 9.181183 -0.261282)
+     (xy 9.192683 -0.289984) (xy 9.196917 -1.153584) (xy 9.732433 -1.155764) (xy 9.732408 -0.722874) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy -8.923894 -2.932733) (xy -8.915316 -2.923715) (xy -8.901715 -2.909120) (xy -8.883414 -2.889302) (xy -8.860739 -2.864615) (xy -8.834011 -2.835415) (xy -8.803555 -2.802057) (xy -8.769694 -2.764894)
+     (xy -8.732752 -2.724282) (xy -8.693053 -2.680577) (xy -8.650921 -2.634131) (xy -8.606678 -2.585302) (xy -8.560649 -2.534442) (xy -8.523573 -2.493434) (xy -8.123782 -2.051051) (xy -8.656120 -2.048871)
+     (xy -8.659110 -1.065711) (xy -8.659393 -0.968570) (xy -8.659655 -0.870136) (xy -8.659896 -0.771025) (xy -8.660116 -0.671854) (xy -8.660312 -0.573237) (xy -8.660485 -0.475791) (xy -8.660635 -0.380131)
+     (xy -8.660759 -0.286874) (xy -8.660859 -0.196635) (xy -8.660932 -0.110031) (xy -8.660979 -0.027676) (xy -8.660998 0.049814) (xy -8.660989 0.121821) (xy -8.660951 0.187732) (xy -8.660884 0.246929)
+     (xy -8.660786 0.298797) (xy -8.660680 0.336549) (xy -8.659259 0.755649) (xy -8.647675 0.789848) (xy -8.628103 0.834828) (xy -8.601591 0.875189) (xy -8.568585 0.910337) (xy -8.539261 0.933318)
+     (xy -8.499898 0.955230) (xy -8.457530 0.969744) (xy -8.413365 0.976804) (xy -8.368610 0.976356) (xy -8.324473 0.968346) (xy -8.282161 0.952718) (xy -8.268235 0.945565) (xy -8.241442 0.927663)
+     (xy -8.214699 0.904377) (xy -8.190178 0.877964) (xy -8.170055 0.850680) (xy -8.160412 0.833651) (xy -8.157319 0.827556) (xy -8.154459 0.822210) (xy -8.151824 0.817275) (xy -8.149404 0.812416)
+     (xy -8.147191 0.807298) (xy -8.145175 0.801583) (xy -8.143347 0.794937) (xy -8.141698 0.787023) (xy -8.140219 0.777506) (xy -8.138901 0.766049) (xy -8.137734 0.752316) (xy -8.136710 0.735972)
+     (xy -8.135819 0.716681) (xy -8.135052 0.694106) (xy -8.134400 0.667913) (xy -8.133854 0.637764) (xy -8.133405 0.603324) (xy -8.133043 0.564257) (xy -8.132760 0.520227) (xy -8.132546 0.470898)
+     (xy -8.132392 0.415935) (xy -8.132289 0.355000) (xy -8.132228 0.287759) (xy -8.132200 0.213876) (xy -8.132196 0.133014) (xy -8.132205 0.044838) (xy -8.132221 -0.050989) (xy -8.132232 -0.154802)
+     (xy -8.132234 -0.201973) (xy -8.132234 -1.155701) (xy -7.594600 -1.155701) (xy -7.594617 -0.195792) (xy -7.594615 -0.087263) (xy -7.594611 0.013138) (xy -7.594612 0.105750) (xy -7.594627 0.190911)
+     (xy -7.594664 0.268962) (xy -7.594730 0.340240) (xy -7.594834 0.405085) (xy -7.594983 0.463835) (xy -7.595186 0.516829) (xy -7.595450 0.564406) (xy -7.595784 0.606905) (xy -7.596196 0.644664)
+     (xy -7.596693 0.678023) (xy -7.597283 0.707321) (xy -7.597976 0.732896) (xy -7.598777 0.755086) (xy -7.599697 0.774232) (xy -7.600741 0.790672) (xy -7.601920 0.804744) (xy -7.603240 0.816787)
+     (xy -7.604709 0.827141) (xy -7.606336 0.836145) (xy -7.608129 0.844136) (xy -7.610095 0.851454) (xy -7.612242 0.858437) (xy -7.614579 0.865426) (xy -7.617114 0.872757) (xy -7.619854 0.880772)
+     (xy -7.620035 0.881312) (xy -7.639446 0.931405) (xy -7.663053 0.977304) (xy -7.691951 1.020718) (xy -7.727232 1.063355) (xy -7.755008 1.092361) (xy -7.799321 1.132995) (xy -7.843635 1.166305)
+     (xy -7.889683 1.193254) (xy -7.939200 1.214805) (xy -7.993916 1.231921) (xy -8.015817 1.237321) (xy -8.023219 1.238969) (xy -8.030607 1.240400) (xy -8.038612 1.241632) (xy -8.047868 1.242683)
+     (xy -8.059007 1.243569) (xy -8.072662 1.244307) (xy -8.089467 1.244915) (xy -8.110053 1.245410) (xy -8.135054 1.245808) (xy -8.165102 1.246128) (xy -8.200830 1.246387) (xy -8.242872 1.246601)
+     (xy -8.291859 1.246788) (xy -8.348425 1.246965) (xy -8.373533 1.247037) (xy -8.425737 1.247137) (xy -8.476163 1.247140) (xy -8.524067 1.247050) (xy -8.568702 1.246875) (xy -8.609326 1.246619)
+     (xy -8.645192 1.246289) (xy -8.675556 1.245890) (xy -8.699672 1.245427) (xy -8.716797 1.244907) (xy -8.726076 1.244347) (xy -8.780383 1.234866) (xy -8.835904 1.218570) (xy -8.890279 1.196315)
+     (xy -8.941147 1.168961) (xy -8.951484 1.162440) (xy -8.977963 1.143194) (xy -9.006927 1.118669) (xy -9.036488 1.090750) (xy -9.064757 1.061324) (xy -9.089845 1.032276) (xy -9.109864 1.005492)
+     (xy -9.112166 1.002012) (xy -9.141044 0.951197) (xy -9.165391 0.895226) (xy -9.181213 0.847117) (xy -9.192683 0.806449) (xy -9.193785 -0.621242) (xy -9.194886 -2.048934) (xy -9.461896 -2.048934)
+     (xy -9.509806 -2.048991) (xy -9.554673 -2.049155) (xy -9.595829 -2.049417) (xy -9.632607 -2.049768) (xy -9.664339 -2.050199) (xy -9.690358 -2.050700) (xy -9.709996 -2.051262) (xy -9.722587 -2.051876)
+     (xy -9.727461 -2.052532) (xy -9.727495 -2.052617) (xy -9.724438 -2.056401) (xy -9.716097 -2.065987) (xy -9.702862 -2.080943) (xy -9.685128 -2.100836) (xy -9.663285 -2.125233) (xy -9.637726 -2.153700)
+     (xy -9.608845 -2.185805) (xy -9.577033 -2.221114) (xy -9.542683 -2.259194) (xy -9.506188 -2.299613) (xy -9.467939 -2.341936) (xy -9.428330 -2.385732) (xy -9.387753 -2.430566) (xy -9.346600 -2.476006)
+     (xy -9.305263 -2.521619) (xy -9.264137 -2.566971) (xy -9.223611 -2.611630) (xy -9.184081 -2.655162) (xy -9.145937 -2.697135) (xy -9.109572 -2.737115) (xy -9.075379 -2.774668) (xy -9.043750 -2.809363)
+     (xy -9.015078 -2.840766) (xy -8.989754 -2.868443) (xy -8.968173 -2.891963) (xy -8.950726 -2.910890) (xy -8.937805 -2.924794) (xy -8.929803 -2.933239) (xy -8.927125 -2.935817) (xy -8.923894 -2.932733) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy -5.928783 -1.153203) (xy -5.887534 -1.143787) (xy -5.824878 -1.126383) (xy -5.768140 -1.103852) (xy -5.716015 -1.075481) (xy -5.667196 -1.040555) (xy -5.620376 -0.998362) (xy -5.619356 -0.997345)
+     (xy -5.576246 -0.949482) (xy -5.540320 -0.898969) (xy -5.510977 -0.844706) (xy -5.487617 -0.785596) (xy -5.470900 -0.726017) (xy -5.468908 -0.713026) (xy -5.467122 -0.692690) (xy -5.465555 -0.666129)
+     (xy -5.464215 -0.634463) (xy -5.463114 -0.598811) (xy -5.462260 -0.560292) (xy -5.461665 -0.520027) (xy -5.461339 -0.479134) (xy -5.461292 -0.438734) (xy -5.461533 -0.399947) (xy -5.462073 -0.363891)
+     (xy -5.462923 -0.331686) (xy -5.464091 -0.304452) (xy -5.465590 -0.283309) (xy -5.466792 -0.273050) (xy -5.480612 -0.207898) (xy -5.501943 -0.146513) (xy -5.530903 -0.088656) (xy -5.567612 -0.034089)
+     (xy -5.611141 0.016343) (xy -5.657776 0.060378) (xy -5.705685 0.096807) (xy -5.756201 0.126491) (xy -5.810659 0.150290) (xy -5.828587 0.156620) (xy -5.842801 0.161289) (xy -5.856119 0.165349)
+     (xy -5.869227 0.168841) (xy -5.882810 0.171808) (xy -5.897554 0.174293) (xy -5.914144 0.176339) (xy -5.933267 0.177988) (xy -5.955606 0.179283) (xy -5.981849 0.180267) (xy -6.012680 0.180982)
+     (xy -6.048785 0.181470) (xy -6.090849 0.181775) (xy -6.139558 0.181939) (xy -6.195598 0.182005) (xy -6.236758 0.182016) (xy -6.527800 0.182033) (xy -6.527800 1.248833) (xy -7.065433 1.248833)
+     (xy -7.065433 -0.088900) (xy -6.527800 -0.088900) (xy -6.380311 -0.088900) (xy -6.340226 -0.088939) (xy -6.307577 -0.089085) (xy -6.281329 -0.089388) (xy -6.260453 -0.089895) (xy -6.243915 -0.090654)
+     (xy -6.230684 -0.091712) (xy -6.219727 -0.093118) (xy -6.210013 -0.094920) (xy -6.200510 -0.097164) (xy -6.200180 -0.097249) (xy -6.155000 -0.112970) (xy -6.114416 -0.135674) (xy -6.078800 -0.165008)
+     (xy -6.048526 -0.200617) (xy -6.023966 -0.242146) (xy -6.008680 -0.279400) (xy -6.006744 -0.285639) (xy -6.005150 -0.292487) (xy -6.003863 -0.300788) (xy -6.002853 -0.311389) (xy -6.002086 -0.325135)
+     (xy -6.001529 -0.342869) (xy -6.001149 -0.365438) (xy -6.000915 -0.393686) (xy -6.000794 -0.428459) (xy -6.000752 -0.470602) (xy -6.000750 -0.484717) (xy -6.000764 -0.528869) (xy -6.000831 -0.565428)
+     (xy -6.000991 -0.595264) (xy -6.001282 -0.619252) (xy -6.001742 -0.638263) (xy -6.002411 -0.653170) (xy -6.003327 -0.664846) (xy -6.004528 -0.674162) (xy -6.006054 -0.681993) (xy -6.007944 -0.689210)
+     (xy -6.010139 -0.696384) (xy -6.028336 -0.740232) (xy -6.053473 -0.779522) (xy -6.085063 -0.813756) (xy -6.122614 -0.842432) (xy -6.165638 -0.865050) (xy -6.181367 -0.871250) (xy -6.212417 -0.882533)
+     (xy -6.370108 -0.883967) (xy -6.527800 -0.885402) (xy -6.527800 -0.088900) (xy -7.065433 -0.088900) (xy -7.065433 -1.155991) (xy -5.928783 -1.153203) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy -4.202179 -1.153392) (xy -4.157379 -1.153117) (xy -4.119153 -1.152578) (xy -4.086556 -1.151701) (xy -4.058643 -1.150410) (xy -4.034468 -1.148629) (xy -4.013085 -1.146284) (xy -3.993548 -1.143300)
+     (xy -3.974913 -1.139600) (xy -3.956233 -1.135111) (xy -3.936564 -1.129757) (xy -3.929082 -1.127611) (xy -3.870934 -1.106681) (xy -3.818095 -1.079173) (xy -3.770649 -1.045169) (xy -3.728683 -1.004755)
+     (xy -3.692282 -0.958013) (xy -3.661531 -0.905030) (xy -3.636515 -0.845888) (xy -3.632941 -0.835533) (xy -3.623358 -0.803085) (xy -3.614433 -0.765875) (xy -3.606945 -0.727606) (xy -3.601673 -0.691983)
+     (xy -3.600564 -0.681567) (xy -3.598802 -0.663663) (xy -3.596942 -0.646125) (xy -3.595783 -0.636059) (xy -3.593581 -0.618067) (xy -3.729022 -0.618067) (xy -3.766828 -0.618010) (xy -3.797043 -0.617979)
+     (xy -3.820543 -0.618180) (xy -3.838202 -0.618822) (xy -3.850893 -0.620112) (xy -3.859493 -0.622259) (xy -3.864875 -0.625470) (xy -3.867913 -0.629953) (xy -3.869483 -0.635916) (xy -3.870458 -0.643566)
+     (xy -3.871531 -0.651934) (xy -3.876310 -0.674532) (xy -3.883979 -0.700904) (xy -3.893478 -0.728027) (xy -3.903746 -0.752878) (xy -3.913724 -0.772432) (xy -3.913836 -0.772618) (xy -3.938111 -0.806913)
+     (xy -3.966082 -0.834421) (xy -3.998416 -0.855519) (xy -4.035781 -0.870581) (xy -4.078844 -0.879983) (xy -4.110567 -0.883261) (xy -4.162394 -0.882782) (xy -4.211505 -0.874452) (xy -4.257549 -0.858357)
+     (xy -4.296041 -0.837329) (xy -4.326185 -0.812776) (xy -4.351277 -0.782180) (xy -4.370987 -0.746525) (xy -4.384981 -0.706797) (xy -4.392928 -0.663982) (xy -4.394493 -0.619065) (xy -4.389346 -0.573033)
+     (xy -4.387802 -0.565272) (xy -4.380297 -0.538824) (xy -4.369065 -0.510279) (xy -4.355582 -0.482892) (xy -4.341323 -0.459918) (xy -4.338149 -0.455678) (xy -4.333495 -0.450170) (xy -4.323585 -0.438790)
+     (xy -4.308809 -0.421977) (xy -4.289554 -0.400168) (xy -4.266211 -0.373803) (xy -4.239168 -0.343320) (xy -4.208815 -0.309156) (xy -4.175540 -0.271750) (xy -4.139733 -0.231541) (xy -4.101782 -0.188966)
+     (xy -4.062078 -0.144464) (xy -4.024346 -0.102210) (xy -3.983128 -0.056028) (xy -3.943156 -0.011155) (xy -3.904833 0.031949) (xy -3.868565 0.072823) (xy -3.834758 0.111010) (xy -3.803816 0.146048)
+     (xy -3.776144 0.177480) (xy -3.752149 0.204846) (xy -3.732235 0.227685) (xy -3.716807 0.245539) (xy -3.706271 0.257949) (xy -3.701387 0.263973) (xy -3.675870 0.302398) (xy -3.652320 0.346829)
+     (xy -3.631770 0.394857) (xy -3.615254 0.444076) (xy -3.604000 0.491025) (xy -3.601291 0.510503) (xy -3.598989 0.536699) (xy -3.597133 0.567874) (xy -3.595762 0.602289) (xy -3.594914 0.638204)
+     (xy -3.594629 0.673879) (xy -3.594946 0.707574) (xy -3.595904 0.737550) (xy -3.597541 0.762067) (xy -3.597858 0.765261) (xy -3.608744 0.831851) (xy -3.627111 0.894544) (xy -3.653073 0.953585)
+     (xy -3.686743 1.009218) (xy -3.728235 1.061685) (xy -3.745608 1.080360) (xy -3.791736 1.124109) (xy -3.838312 1.160251) (xy -3.886742 1.189591) (xy -3.938434 1.212935) (xy -3.994792 1.231086)
+     (xy -4.019550 1.237209) (xy -4.028686 1.239184) (xy -4.037860 1.240846) (xy -4.047895 1.242228) (xy -4.059610 1.243360) (xy -4.073827 1.244276) (xy -4.091365 1.245009) (xy -4.113047 1.245589)
+     (xy -4.139692 1.246050) (xy -4.172121 1.246424) (xy -4.211156 1.246744) (xy -4.257617 1.247040) (xy -4.271434 1.247120) (xy -4.322498 1.247366) (xy -4.365886 1.247464) (xy -4.402384 1.247399)
+     (xy -4.432781 1.247155) (xy -4.457865 1.246716) (xy -4.478425 1.246066) (xy -4.495248 1.245189) (xy -4.509123 1.244070) (xy -4.520837 1.242693) (xy -4.525434 1.242013) (xy -4.572684 1.232004)
+     (xy -4.620330 1.217120) (xy -4.666929 1.198104) (xy -4.711040 1.175699) (xy -4.751222 1.150648) (xy -4.786032 1.123695) (xy -4.814028 1.095582) (xy -4.817387 1.091515) (xy -4.851255 1.043287)
+     (xy -4.880459 0.989016) (xy -4.904296 0.930140) (xy -4.917744 0.885701) (xy -4.922516 0.865482) (xy -4.925951 0.845569) (xy -4.928343 0.823523) (xy -4.929985 0.796905) (xy -4.930727 0.777874)
+     (xy -4.932950 0.711199) (xy -4.661966 0.711199) (xy -4.659879 0.758824) (xy -4.655752 0.798676) (xy -4.646696 0.833146) (xy -4.632072 0.863142) (xy -4.611238 0.889571) (xy -4.583552 0.913342)
+     (xy -4.548374 0.935360) (xy -4.527550 0.946106) (xy -4.489221 0.961996) (xy -4.450208 0.972150) (xy -4.407959 0.977116) (xy -4.380620 0.977837) (xy -4.341363 0.976013) (xy -4.307298 0.970278)
+     (xy -4.275834 0.960055) (xy -4.252820 0.949323) (xy -4.219257 0.927960) (xy -4.191950 0.901753) (xy -4.169752 0.869506) (xy -4.162140 0.854844) (xy -4.144412 0.808784) (xy -4.134434 0.761303)
+     (xy -4.132155 0.713435) (xy -4.137523 0.666211) (xy -4.150489 0.620665) (xy -4.171001 0.577829) (xy -4.176193 0.569383) (xy -4.180792 0.563439) (xy -4.190667 0.551627) (xy -4.205437 0.534379)
+     (xy -4.224723 0.512127) (xy -4.248145 0.485303) (xy -4.275322 0.454338) (xy -4.305874 0.419666) (xy -4.339421 0.381717) (xy -4.375584 0.340924) (xy -4.413981 0.297719) (xy -4.454233 0.252535)
+     (xy -4.495960 0.205802) (xy -4.503964 0.196850) (xy -4.546122 0.149635) (xy -4.586996 0.103717) (xy -4.626195 0.059542) (xy -4.663324 0.017561) (xy -4.697993 -0.021780) (xy -4.729809 -0.058031)
+     (xy -4.758378 -0.090744) (xy -4.783309 -0.119471) (xy -4.804208 -0.143763) (xy -4.820685 -0.163171) (xy -4.832345 -0.177248) (xy -4.838796 -0.185545) (xy -4.839293 -0.186267) (xy -4.870364 -0.239100)
+     (xy -4.895353 -0.295365) (xy -4.914948 -0.356683) (xy -4.919986 -0.376767) (xy -4.923214 -0.395388) (xy -4.925959 -0.420919) (xy -4.928192 -0.451817) (xy -4.929884 -0.486538) (xy -4.931007 -0.523538)
+     (xy -4.931533 -0.561274) (xy -4.931433 -0.598201) (xy -4.930678 -0.632776) (xy -4.929240 -0.663455) (xy -4.927091 -0.688694) (xy -4.925897 -0.697784) (xy -4.911932 -0.762426) (xy -4.890389 -0.824143)
+     (xy -4.861763 -0.882346) (xy -4.826551 -0.936446) (xy -4.785248 -0.985853) (xy -4.738349 -1.029979) (xy -4.686352 -1.068232) (xy -4.629750 -1.100026) (xy -4.569041 -1.124769) (xy -4.565867 -1.125823)
+     (xy -4.546932 -1.131938) (xy -4.529830 -1.137081) (xy -4.513620 -1.141338) (xy -4.497365 -1.144790) (xy -4.480126 -1.147522) (xy -4.460966 -1.149618) (xy -4.438944 -1.151159) (xy -4.413124 -1.152230)
+     (xy -4.382567 -1.152914) (xy -4.346334 -1.153294) (xy -4.303487 -1.153454) (xy -4.254500 -1.153478) (xy -4.202179 -1.153392) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy -2.527300 -0.735373) (xy -2.527306 -0.664445) (xy -2.527305 -0.601453) (xy -2.527267 -0.545865) (xy -2.527161 -0.497151) (xy -2.526959 -0.454780) (xy -2.526631 -0.418221) (xy -2.526147 -0.386942)
+     (xy -2.525477 -0.360414) (xy -2.524592 -0.338105) (xy -2.523462 -0.319484) (xy -2.522057 -0.304020) (xy -2.520348 -0.291182) (xy -2.518304 -0.280440) (xy -2.515897 -0.271262) (xy -2.513096 -0.263117)
+     (xy -2.509872 -0.255475) (xy -2.506195 -0.247804) (xy -2.502035 -0.239574) (xy -2.499260 -0.234075) (xy -2.479052 -0.201157) (xy -2.452997 -0.170176) (xy -2.422985 -0.142952) (xy -2.390906 -0.121301)
+     (xy -2.372546 -0.112205) (xy -2.328440 -0.097524) (xy -2.283031 -0.090233) (xy -2.238001 -0.090513) (xy -2.210371 -0.094704) (xy -2.167480 -0.108063) (xy -2.127463 -0.128819) (xy -2.091202 -0.156137)
+     (xy -2.059580 -0.189184) (xy -2.033476 -0.227128) (xy -2.013774 -0.269135) (xy -2.008219 -0.285750) (xy -2.006969 -0.290377) (xy -2.005860 -0.295741) (xy -2.004879 -0.302361) (xy -2.004018 -0.310752)
+     (xy -2.003266 -0.321434) (xy -2.002613 -0.334923) (xy -2.002048 -0.351737) (xy -2.001560 -0.372392) (xy -2.001140 -0.397408) (xy -2.000777 -0.427300) (xy -2.000460 -0.462587) (xy -2.000180 -0.503786)
+     (xy -1.999925 -0.551414) (xy -1.999686 -0.605989) (xy -1.999452 -0.668028) (xy -1.999228 -0.733425) (xy -1.997824 -1.155701) (xy -1.464444 -1.155701) (xy -1.465812 -0.701675) (xy -1.467179 -0.247650)
+     (xy -1.478317 -0.202663) (xy -1.495447 -0.145409) (xy -1.517192 -0.094364) (xy -1.544234 -0.048238) (xy -1.577253 -0.005745) (xy -1.589490 0.007609) (xy -1.627240 0.043259) (xy -1.668765 0.074556)
+     (xy -1.714754 0.101807) (xy -1.765900 0.125317) (xy -1.822892 0.145393) (xy -1.886422 0.162342) (xy -1.957182 0.176471) (xy -1.978009 0.179904) (xy -1.993868 0.182410) (xy -1.994942 0.714563)
+     (xy -1.996017 1.246716) (xy -2.531533 1.248896) (xy -2.531533 0.182416) (xy -2.547408 0.179901) (xy -2.619447 0.166727) (xy -2.683905 0.151171) (xy -2.741385 0.133034) (xy -2.792486 0.112117)
+     (xy -2.837809 0.088224) (xy -2.851828 0.079505) (xy -2.900902 0.043786) (xy -2.942896 0.004560) (xy -2.978307 -0.038888) (xy -3.007635 -0.087275) (xy -3.031378 -0.141314) (xy -3.050033 -0.201722)
+     (xy -3.051317 -0.206836) (xy -3.062449 -0.251884) (xy -3.063854 -0.703792) (xy -3.065258 -1.155701) (xy -2.527300 -1.155701) (xy -2.527300 -0.735373) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy 0.434975 -1.154601) (xy 0.515980 -1.154402) (xy 0.588968 -1.154214) (xy 0.654389 -1.154029) (xy 0.712693 -1.153840) (xy 0.764329 -1.153640) (xy 0.809747 -1.153420) (xy 0.849396 -1.153174)
+     (xy 0.883727 -1.152893) (xy 0.913189 -1.152569) (xy 0.938233 -1.152196) (xy 0.959306 -1.151766) (xy 0.976860 -1.151271) (xy 0.991345 -1.150703) (xy 1.003209 -1.150054) (xy 1.012902 -1.149318)
+     (xy 1.020875 -1.148487) (xy 1.027577 -1.147552) (xy 1.033458 -1.146507) (xy 1.038967 -1.145343) (xy 1.043517 -1.144297) (xy 1.102505 -1.127713) (xy 1.155963 -1.106523) (xy 1.205371 -1.079876)
+     (xy 1.252210 -1.046920) (xy 1.297959 -1.006804) (xy 1.318822 -0.985944) (xy 1.359259 -0.940089) (xy 1.392519 -0.893309) (xy 1.419516 -0.843923) (xy 1.441163 -0.790250) (xy 1.458376 -0.730607)
+     (xy 1.458971 -0.728134) (xy 1.459935 -0.723735) (xy 1.460816 -0.718708) (xy 1.461618 -0.712666) (xy 1.462346 -0.705220) (xy 1.463006 -0.695982) (xy 1.463600 -0.684562) (xy 1.464135 -0.670573)
+     (xy 1.464614 -0.653625) (xy 1.465042 -0.633331) (xy 1.465424 -0.609301) (xy 1.465764 -0.581147) (xy 1.466067 -0.548481) (xy 1.466337 -0.510915) (xy 1.466579 -0.468058) (xy 1.466798 -0.419524)
+     (xy 1.466998 -0.364923) (xy 1.467184 -0.303867) (xy 1.467360 -0.235967) (xy 1.467531 -0.160835) (xy 1.467702 -0.078083) (xy 1.467876 0.012679) (xy 1.467908 0.029633) (xy 1.468086 0.124026)
+     (xy 1.468246 0.210349) (xy 1.468378 0.289000) (xy 1.468470 0.360375) (xy 1.468513 0.424872) (xy 1.468494 0.482887) (xy 1.468405 0.534818) (xy 1.468234 0.581061) (xy 1.467970 0.622013)
+     (xy 1.467604 0.658072) (xy 1.467124 0.689635) (xy 1.466519 0.717098) (xy 1.465780 0.740858) (xy 1.464895 0.761313) (xy 1.463855 0.778860) (xy 1.462647 0.793896) (xy 1.461262 0.806817)
+     (xy 1.459689 0.818020) (xy 1.457918 0.827904) (xy 1.455937 0.836864) (xy 1.453737 0.845297) (xy 1.451306 0.853602) (xy 1.448634 0.862174) (xy 1.445710 0.871411) (xy 1.445363 0.872516)
+     (xy 1.425260 0.927040) (xy 1.400334 0.976774) (xy 1.369559 1.023384) (xy 1.331906 1.068532) (xy 1.310768 1.090492) (xy 1.265775 1.131810) (xy 1.220596 1.165741) (xy 1.173543 1.193228)
+     (xy 1.122924 1.215217) (xy 1.067049 1.232651) (xy 1.047750 1.237430) (xy 1.042220 1.238694) (xy 1.036688 1.239834) (xy 1.030703 1.240857) (xy 1.023818 1.241771) (xy 1.015583 1.242584)
+     (xy 1.005549 1.243304) (xy 0.993269 1.243937) (xy 0.978293 1.244491) (xy 0.960172 1.244974) (xy 0.938458 1.245394) (xy 0.912701 1.245757) (xy 0.882454 1.246073) (xy 0.847266 1.246347)
+     (xy 0.806690 1.246589) (xy 0.760277 1.246804) (xy 0.707577 1.247002) (xy 0.648143 1.247189) (xy 0.581524 1.247373) (xy 0.507273 1.247562) (xy 0.437092 1.247733) (xy -0.135467 1.249122)
+     (xy -0.135467 0.977899) (xy 0.402167 0.977899) (xy 0.544162 0.977899) (xy 0.585863 0.977818) (xy 0.620098 0.977550) (xy 0.647865 0.977055) (xy 0.670161 0.976295) (xy 0.687987 0.975233)
+     (xy 0.702340 0.973830) (xy 0.714219 0.972047) (xy 0.718593 0.971200) (xy 0.764048 0.957722) (xy 0.805501 0.937159) (xy 0.842250 0.910055) (xy 0.873592 0.876953) (xy 0.898823 0.838397)
+     (xy 0.904262 0.827616) (xy 0.907690 0.820606) (xy 0.910818 0.814370) (xy 0.913658 0.808509) (xy 0.916225 0.802628) (xy 0.918531 0.796326) (xy 0.920592 0.789207) (xy 0.922420 0.780873)
+     (xy 0.924030 0.770925) (xy 0.925436 0.758966) (xy 0.926650 0.744597) (xy 0.927687 0.727421) (xy 0.928561 0.707040) (xy 0.929286 0.683055) (xy 0.929875 0.655070) (xy 0.930342 0.622685)
+     (xy 0.930700 0.585504) (xy 0.930965 0.543127) (xy 0.931149 0.495158) (xy 0.931266 0.441198) (xy 0.931330 0.380849) (xy 0.931355 0.313713) (xy 0.931355 0.239393) (xy 0.931343 0.157490)
+     (xy 0.931334 0.067607) (xy 0.931333 0.046566) (xy 0.931342 -0.045217) (xy 0.931359 -0.128932) (xy 0.931368 -0.204979) (xy 0.931355 -0.273754) (xy 0.931304 -0.335659) (xy 0.931200 -0.391090)
+     (xy 0.931028 -0.440448) (xy 0.930773 -0.484130) (xy 0.930420 -0.522536) (xy 0.929953 -0.556065) (xy 0.929358 -0.585114) (xy 0.928618 -0.610083) (xy 0.927720 -0.631371) (xy 0.926648 -0.649377)
+     (xy 0.925387 -0.664498) (xy 0.923921 -0.677135) (xy 0.922235 -0.687685) (xy 0.920315 -0.696548) (xy 0.918145 -0.704122) (xy 0.915710 -0.710807) (xy 0.912995 -0.717000) (xy 0.909985 -0.723100)
+     (xy 0.906664 -0.729508) (xy 0.903018 -0.736620) (xy 0.901452 -0.739777) (xy 0.878882 -0.776594) (xy 0.849483 -0.809752) (xy 0.814479 -0.838210) (xy 0.775092 -0.860925) (xy 0.745067 -0.873018)
+     (xy 0.737491 -0.875411) (xy 0.729873 -0.877365) (xy 0.721262 -0.878936) (xy 0.710707 -0.880180) (xy 0.697257 -0.881153) (xy 0.679959 -0.881908) (xy 0.657863 -0.882503) (xy 0.630017 -0.882991)
+     (xy 0.595470 -0.883430) (xy 0.559858 -0.883807) (xy 0.402167 -0.885402) (xy 0.402167 0.977899) (xy -0.135467 0.977899) (xy -0.135467 -1.155990) (xy 0.434975 -1.154601) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy 3.335866 -0.884767) (xy 2.535766 -0.884767) (xy 2.535766 -0.088900) (xy 3.069166 -0.088900) (xy 3.069166 0.182033) (xy 2.535766 0.182033) (xy 2.535766 0.977899) (xy 3.335866 0.977899)
+     (xy 3.335866 1.248833) (xy 1.998133 1.248833) (xy 1.998133 -1.155701) (xy 3.335866 -1.155701) (xy 3.335866 -0.884767) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy 4.596650 -1.155235) (xy 4.652292 -1.154105) (xy 4.701273 -1.152089) (xy 4.744486 -1.149049) (xy 4.782822 -1.144849) (xy 4.817173 -1.139354) (xy 4.848432 -1.132426) (xy 4.877491 -1.123931)
+     (xy 4.905241 -1.113731) (xy 4.932574 -1.101690) (xy 4.953000 -1.091544) (xy 5.001853 -1.061562) (xy 5.045663 -1.024908) (xy 5.084308 -0.981799) (xy 5.117663 -0.932454) (xy 5.145608 -0.877089)
+     (xy 5.168019 -0.815922) (xy 5.184774 -0.749171) (xy 5.195750 -0.677053) (xy 5.197666 -0.657168) (xy 5.201009 -0.617952) (xy 5.065806 -0.619068) (xy 4.930604 -0.620184) (xy 4.922491 -0.660346)
+     (xy 4.908814 -0.712407) (xy 4.890206 -0.757596) (xy 4.866669 -0.795909) (xy 4.838206 -0.827340) (xy 4.804823 -0.851887) (xy 4.766521 -0.869544) (xy 4.748677 -0.874982) (xy 4.726668 -0.879048)
+     (xy 4.699254 -0.881556) (xy 4.669075 -0.882504) (xy 4.638771 -0.881892) (xy 4.610982 -0.879718) (xy 4.588349 -0.875981) (xy 4.584700 -0.875053) (xy 4.539498 -0.858883) (xy 4.500421 -0.836873)
+     (xy 4.467415 -0.808971) (xy 4.440426 -0.775123) (xy 4.419400 -0.735279) (xy 4.408516 -0.704850) (xy 4.404317 -0.684356) (xy 4.401814 -0.658305) (xy 4.401044 -0.629444) (xy 4.402049 -0.600520)
+     (xy 4.404867 -0.574280) (xy 4.406511 -0.565150) (xy 4.413088 -0.542438) (xy 4.423581 -0.516232) (xy 4.436603 -0.489356) (xy 4.450765 -0.464637) (xy 4.464681 -0.444900) (xy 4.466800 -0.442384)
+     (xy 4.472188 -0.436274) (xy 4.482807 -0.424313) (xy 4.498246 -0.406965) (xy 4.518093 -0.384690) (xy 4.541936 -0.357949) (xy 4.569363 -0.327205) (xy 4.599963 -0.292919) (xy 4.633322 -0.255553)
+     (xy 4.669031 -0.215569) (xy 4.706676 -0.173427) (xy 4.745846 -0.129590) (xy 4.766723 -0.106229) (xy 4.806528 -0.061685) (xy 4.845024 -0.018592) (xy 4.881800 0.022589) (xy 4.916442 0.061396)
+     (xy 4.948540 0.097366) (xy 4.977681 0.130039) (xy 5.003452 0.158950) (xy 5.025443 0.183640) (xy 5.043240 0.203644) (xy 5.056432 0.218502) (xy 5.064607 0.227751) (xy 5.066739 0.230192)
+     (xy 5.106186 0.282337) (xy 5.139486 0.340047) (xy 5.166398 0.402824) (xy 5.186682 0.470167) (xy 5.190795 0.488152) (xy 5.193622 0.502142) (xy 5.195819 0.515475) (xy 5.197466 0.529497)
+     (xy 5.198645 0.545557) (xy 5.199434 0.565003) (xy 5.199913 0.589182) (xy 5.200163 0.619444) (xy 5.200248 0.647699) (xy 5.200154 0.689964) (xy 5.199613 0.725146) (xy 5.198480 0.754624)
+     (xy 5.196608 0.779777) (xy 5.193853 0.801984) (xy 5.190067 0.822623) (xy 5.185105 0.843073) (xy 5.178822 0.864714) (xy 5.176525 0.872066) (xy 5.154467 0.930233) (xy 5.126283 0.984009)
+     (xy 5.091266 1.034517) (xy 5.048709 1.082881) (xy 5.035912 1.095642) (xy 4.988847 1.137431) (xy 4.940993 1.171637) (xy 4.890799 1.199107) (xy 4.836715 1.220691) (xy 4.777316 1.237209)
+     (xy 4.768191 1.239183) (xy 4.759040 1.240844) (xy 4.749044 1.242222) (xy 4.737382 1.243350) (xy 4.723233 1.244260) (xy 4.705777 1.244984) (xy 4.684192 1.245553) (xy 4.657658 1.245999)
+     (xy 4.625354 1.246355) (xy 4.586460 1.246651) (xy 4.540155 1.246921) (xy 4.525433 1.246998) (xy 4.482742 1.247145) (xy 4.441878 1.247149) (xy 4.403772 1.247019) (xy 4.369351 1.246764)
+     (xy 4.339544 1.246395) (xy 4.315281 1.245919) (xy 4.297489 1.245348) (xy 4.287099 1.244689) (xy 4.286250 1.244585) (xy 4.222946 1.231799) (xy 4.160327 1.211338) (xy 4.100160 1.183925)
+     (xy 4.044212 1.150283) (xy 4.028952 1.139409) (xy 3.997540 1.111726) (xy 3.967748 1.076870) (xy 3.940332 1.036090) (xy 3.916042 0.990637) (xy 3.895632 0.941758) (xy 3.880395 0.892805)
+     (xy 3.874871 0.868085) (xy 3.870046 0.839986) (xy 3.866155 0.810680) (xy 3.863433 0.782336) (xy 3.862116 0.757125) (xy 3.862437 0.737217) (xy 3.862984 0.731873) (xy 3.865828 0.711199)
+     (xy 4.135966 0.711199) (xy 4.135966 0.753087) (xy 4.137931 0.790098) (xy 4.144235 0.821560) (xy 4.155494 0.849530) (xy 4.172326 0.876062) (xy 4.173168 0.877181) (xy 4.201361 0.907533)
+     (xy 4.235836 0.932886) (xy 4.275814 0.952910) (xy 4.320517 0.967277) (xy 4.369166 0.975660) (xy 4.412013 0.977837) (xy 4.459951 0.974555) (xy 4.503713 0.965042) (xy 4.542752 0.949587)
+     (xy 4.576523 0.928476) (xy 4.604479 0.901996) (xy 4.626074 0.870435) (xy 4.629620 0.863459) (xy 4.640309 0.840486) (xy 4.648032 0.821318) (xy 4.653258 0.803697) (xy 4.656457 0.785367)
+     (xy 4.658100 0.764070) (xy 4.658657 0.737549) (xy 4.658679 0.723899) (xy 4.658097 0.690976) (xy 4.656122 0.664324) (xy 4.652235 0.641795) (xy 4.645918 0.621239) (xy 4.636650 0.600508)
+     (xy 4.623914 0.577452) (xy 4.622901 0.575733) (xy 4.616944 0.567376) (xy 4.605337 0.552876) (xy 4.588160 0.532325) (xy 4.565493 0.505815) (xy 4.537415 0.473436) (xy 4.504007 0.435281)
+     (xy 4.465347 0.391439) (xy 4.421515 0.342003) (xy 4.372592 0.287065) (xy 4.318656 0.226714) (xy 4.305182 0.211666) (xy 4.263961 0.165625) (xy 4.224056 0.121010) (xy 4.185863 0.078269)
+     (xy 4.149781 0.037846) (xy 4.116206 0.000191) (xy 4.085536 -0.034252) (xy 4.058169 -0.065035) (xy 4.034503 -0.091712) (xy 4.014934 -0.113835) (xy 3.999860 -0.130958) (xy 3.989679 -0.142635)
+     (xy 3.984988 -0.148167) (xy 3.947276 -0.201760) (xy 3.915885 -0.260896) (xy 3.890910 -0.325379) (xy 3.880788 -0.359834) (xy 3.877104 -0.373957) (xy 3.874182 -0.386178) (xy 3.871917 -0.397748)
+     (xy 3.870203 -0.409920) (xy 3.868935 -0.423944) (xy 3.868007 -0.441070) (xy 3.867314 -0.462552) (xy 3.866750 -0.489638) (xy 3.866211 -0.523582) (xy 3.866046 -0.534732) (xy 3.865582 -0.580300)
+     (xy 3.865735 -0.618712) (xy 3.866631 -0.651266) (xy 3.868399 -0.679260) (xy 3.871166 -0.703990) (xy 3.875060 -0.726754) (xy 3.880210 -0.748849) (xy 3.886742 -0.771573) (xy 3.890563 -0.783566)
+     (xy 3.910126 -0.835666) (xy 3.933436 -0.882522) (xy 3.961698 -0.926058) (xy 3.996120 -0.968198) (xy 4.025712 -0.999067) (xy 4.061500 -1.032246) (xy 4.095972 -1.059426) (xy 4.131496 -1.082231)
+     (xy 4.170439 -1.102285) (xy 4.186899 -1.109640) (xy 4.213619 -1.120464) (xy 4.239980 -1.129539) (xy 4.267011 -1.137001) (xy 4.295742 -1.142986) (xy 4.327202 -1.147632) (xy 4.362420 -1.151074)
+     (xy 4.402426 -1.153449) (xy 4.448249 -1.154893) (xy 4.500918 -1.155544) (xy 4.533456 -1.155613) (xy 4.596650 -1.155235) )(layer F.SilkS) (width  0.010000)
+  )
+  (fp_poly (pts (xy 5.998615 -1.155700) (xy 6.265298 -1.155700) (xy 6.266374 -0.668667) (xy 6.267450 -0.181633) (xy 6.697133 -0.668410) (xy 7.126817 -1.155187) (xy 7.363178 -1.155444) (xy 7.413019 -1.155430)
+     (xy 7.458017 -1.155280) (xy 7.497666 -1.155002) (xy 7.531463 -1.154604) (xy 7.558903 -1.154093) (xy 7.579482 -1.153478) (xy 7.592696 -1.152766) (xy 7.598041 -1.151964) (xy 7.598128 -1.151807)
+     (xy 7.595213 -1.148293) (xy 7.586947 -1.138765) (xy 7.573604 -1.123534) (xy 7.555461 -1.102911) (xy 7.532792 -1.077208) (xy 7.505875 -1.046737) (xy 7.474983 -1.011808) (xy 7.440394 -0.972733)
+     (xy 7.402382 -0.929823) (xy 7.361224 -0.883390) (xy 7.317194 -0.833744) (xy 7.270570 -0.781198) (xy 7.221626 -0.726062) (xy 7.170639 -0.668649) (xy 7.117883 -0.609268) (xy 7.067550 -0.552636)
+     (xy 7.013413 -0.491715) (xy 6.960802 -0.432469) (xy 6.909992 -0.375211) (xy 6.861257 -0.320251) (xy 6.814873 -0.267901) (xy 6.771115 -0.218473) (xy 6.730256 -0.172277) (xy 6.692573 -0.129624)
+     (xy 6.658340 -0.090827) (xy 6.627832 -0.056196) (xy 6.601323 -0.026042) (xy 6.579089 -0.000678) (xy 6.561405 0.019587) (xy 6.548545 0.034440) (xy 6.540784 0.043570) (xy 6.538383 0.046652)
+     (xy 6.541153 0.050177) (xy 6.549279 0.059713) (xy 6.562487 0.074948) (xy 6.580501 0.095573) (xy 6.603047 0.121274) (xy 6.629849 0.151741) (xy 6.660633 0.186663) (xy 6.695123 0.225729)
+     (xy 6.733044 0.268627) (xy 6.774123 0.315046) (xy 6.818083 0.364674) (xy 6.864649 0.417201) (xy 6.913547 0.472315) (xy 6.964502 0.529705) (xy 7.017239 0.589059) (xy 7.067550 0.645646)
+     (xy 7.121709 0.706555) (xy 7.174356 0.765788) (xy 7.225214 0.823035) (xy 7.274008 0.877983) (xy 7.320462 0.930322) (xy 7.364300 0.979740) (xy 7.405246 1.025926) (xy 7.443025 1.068567)
+     (xy 7.477360 1.107353) (xy 7.507976 1.141973) (xy 7.534597 1.172114) (xy 7.556948 1.197465) (xy 7.574751 1.217716) (xy 7.587732 1.232553) (xy 7.595615 1.241667) (xy 7.598128 1.244731)
+     (xy 7.594259 1.245625) (xy 7.582160 1.246411) (xy 7.562065 1.247085) (xy 7.534209 1.247645) (xy 7.498827 1.248086) (xy 7.456155 1.248405) (xy 7.406427 1.248600) (xy 7.349878 1.248665)
+     (xy 7.331428 1.248659) (xy 7.063317 1.248486) (xy 6.665383 0.783396) (xy 6.267450 0.318305) (xy 6.265296 1.248833) (xy 5.731933 1.248833) (xy 5.731933 -1.155701) (xy 5.998615 -1.155700) )(layer F.SilkS) (width  0.010000)
+  )
+)

pcb/upsy-desky.kicad_pro

@@ -1,15 +1,19 @@
 {
   "board": {
+    "3dviewports": [],
     "design_settings": {
       "defaults": {
-        "board_outline_line_width": 0.09999999999999999,
-        "copper_line_width": 0.19999999999999998,
+        "apply_defaults_to_fp_fields": false,
+        "apply_defaults_to_fp_shapes": false,
+        "apply_defaults_to_fp_text": false,
+        "board_outline_line_width": 0.1,
+        "copper_line_width": 0.2,
         "copper_text_italic": false,
         "copper_text_size_h": 1.5,
         "copper_text_size_v": 1.5,
         "copper_text_thickness": 0.3,
         "copper_text_upright": false,
-        "courtyard_line_width": 0.049999999999999996,
+        "courtyard_line_width": 0.05,
         "dimension_precision": 4,
         "dimension_units": 3,
         "dimensions": {
@@ -20,7 +24,7 @@
           "text_position": 0,
           "units_format": 1
         },
-        "fab_line_width": 0.09999999999999999,
+        "fab_line_width": 0.1,
         "fab_text_italic": false,
         "fab_text_size_h": 1.0,
         "fab_text_size_v": 1.0,
@@ -56,7 +60,6 @@
         }
       ],
       "drc_exclusions": [
-        "courtyards_overlap|159618001|75057000|1727399f-28b5-4a4d-83ce-8809fe9cdec4|7f7682d1-a5f5-4493-8e01-c35882b526c9",
         "items_not_allowed|163068000|75057000|41456f29-a703-4d12-85d0-c21ea7c0a452|00000000-0000-0000-0000-000000000000",
         "items_not_allowed|163068000|75057000|7f7682d1-a5f5-4493-8e01-c35882b526c9|00000000-0000-0000-0000-000000000000"
       ],
@@ -66,20 +69,28 @@
       "rule_severities": {
         "annular_width": "error",
         "clearance": "error",
+        "connection_width": "warning",
         "copper_edge_clearance": "error",
+        "copper_sliver": "warning",
         "courtyards_overlap": "error",
         "diff_pair_gap_out_of_range": "error",
         "diff_pair_uncoupled_length_too_long": "error",
         "drill_out_of_range": "error",
         "duplicate_footprints": "warning",
         "extra_footprint": "warning",
+        "footprint": "error",
+        "footprint_symbol_mismatch": "warning",
         "footprint_type_mismatch": "error",
         "hole_clearance": "error",
         "hole_near_hole": "error",
+        "holes_co_located": "warning",
         "invalid_outline": "error",
+        "isolated_copper": "warning",
         "item_on_disabled_layer": "error",
         "items_not_allowed": "error",
         "length_out_of_range": "error",
+        "lib_footprint_issues": "warning",
+        "lib_footprint_mismatch": "warning",
         "malformed_courtyard": "error",
         "microvia_drill_out_of_range": "error",
         "missing_courtyard": "ignore",
@@ -89,9 +100,14 @@
         "padstack": "error",
         "pth_inside_courtyard": "ignore",
         "shorting_items": "error",
+        "silk_edge_clearance": "warning",
         "silk_over_copper": "ignore",
         "silk_overlap": "warning",
         "skew_out_of_range": "error",
+        "solder_mask_bridge": "error",
+        "starved_thermal": "error",
+        "text_height": "warning",
+        "text_thickness": "warning",
         "through_hole_pad_without_hole": "error",
         "too_many_vias": "error",
         "track_dangling": "warning",
@@ -100,7 +116,6 @@
         "unconnected_items": "error",
         "unresolved_variable": "error",
         "via_dangling": "warning",
-        "zone_has_empty_net": "error",
         "zones_intersect": "error"
       },
       "rules": {
@@ -108,20 +123,68 @@
         "allow_microvias": false,
         "max_error": 0.005,
         "min_clearance": 0.0,
+        "min_connection": 0.0,
         "min_copper_edge_clearance": 0.0,
         "min_hole_clearance": 0.25,
         "min_hole_to_hole": 0.25,
-        "min_microvia_diameter": 0.19999999999999998,
-        "min_microvia_drill": 0.09999999999999999,
+        "min_microvia_diameter": 0.2,
+        "min_microvia_drill": 0.1,
+        "min_resolved_spokes": 2,
         "min_silk_clearance": 0.0,
+        "min_text_height": 0.8,
+        "min_text_thickness": 0.08,
         "min_through_hole_diameter": 0.3,
-        "min_track_width": 0.19999999999999998,
-        "min_via_annular_width": 0.049999999999999996,
-        "min_via_diameter": 0.39999999999999997,
+        "min_track_width": 0.2,
+        "min_via_annular_width": 0.05,
+        "min_via_diameter": 0.4,
         "solder_mask_clearance": 0.0,
         "solder_mask_min_width": 0.0,
+        "solder_mask_to_copper_clearance": 0.0,
         "use_height_for_length_calcs": true
       },
+      "teardrop_options": [
+        {
+          "td_onpadsmd": true,
+          "td_onroundshapesonly": false,
+          "td_ontrackend": false,
+          "td_onviapad": true
+        }
+      ],
+      "teardrop_parameters": [
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_round_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_rect_shape",
+          "td_width_to_size_filter_ratio": 0.9
+        },
+        {
+          "td_allow_use_two_tracks": true,
+          "td_curve_segcount": 0,
+          "td_height_ratio": 1.0,
+          "td_length_ratio": 0.5,
+          "td_maxheight": 2.0,
+          "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
+          "td_target_name": "td_track_end",
+          "td_width_to_size_filter_ratio": 0.9
+        }
+      ],
       "track_widths": [
         0.0,
         0.2,
@@ -129,6 +192,32 @@
         0.4,
         0.5
       ],
+      "tuning_pattern_settings": {
+        "diff_pair_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 1.0
+        },
+        "diff_pair_skew_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 0.6
+        },
+        "single_track_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 0.6
+        }
+      },
       "via_dimensions": [
         {
           "diameter": 0.0,
@@ -138,7 +227,15 @@
       "zones_allow_external_fillets": false,
       "zones_use_no_outline": true
     },
-    "layer_presets": []
+    "ipc2581": {
+      "dist": "",
+      "distpn": "",
+      "internal_id": "",
+      "mfg": "",
+      "mpn": ""
+    },
+    "layer_presets": [],
+    "viewports": []
   },
   "boards": [],
   "cvpcb": {
@@ -322,18 +419,23 @@
     "rule_severities": {
       "bus_definition_conflict": "error",
       "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
       "different_unit_footprint": "error",
       "different_unit_net": "error",
       "duplicate_reference": "error",
       "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
       "extra_units": "error",
       "global_label_dangling": "warning",
       "hier_label_mismatch": "error",
       "label_dangling": "error",
       "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
       "multiple_net_names": "warning",
       "net_not_bus_member": "warning",
       "no_connect_connected": "warning",
@@ -343,6 +445,7 @@
       "pin_to_pin": "warning",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
+      "simulation_model_issue": "error",
       "unannotated": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
@@ -360,7 +463,7 @@
   "net_settings": {
     "classes": [
       {
-        "bus_width": 12.0,
+        "bus_width": 12,
         "clearance": 0.2,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -374,28 +477,172 @@
         "track_width": 0.25,
         "via_diameter": 0.8,
         "via_drill": 0.4,
-        "wire_width": 6.0
+        "wire_width": 6
       }
     ],
     "meta": {
-      "version": 2
+      "version": 3
     },
-    "net_colors": null
+    "net_colors": null,
+    "netclass_assignments": null,
+    "netclass_patterns": []
   },
   "pcbnew": {
     "last_paths": {
       "gencad": "",
       "idf": "",
       "netlist": "../../../../Applications/KiCad/KiCad.app/Contents/Applications/",
+      "plot": "gerbers",
+      "pos_files": "gerbers",
       "specctra_dsn": "",
       "step": "upsy-desky.step",
+      "svg": "",
       "vrml": ""
     },
     "page_layout_descr_file": ""
   },
   "schematic": {
     "annotate_start_num": 0,
+    "bom_export_filename": "",
+    "bom_fmt_presets": [],
+    "bom_fmt_settings": {
+      "field_delimiter": ",",
+      "keep_line_breaks": false,
+      "keep_tabs": false,
+      "name": "CSV",
+      "ref_delimiter": ",",
+      "ref_range_delimiter": "",
+      "string_delimiter": "\""
+    },
+    "bom_presets": [],
+    "bom_settings": {
+      "exclude_dnp": false,
+      "fields_ordered": [
+        {
+          "group_by": false,
+          "label": "Reference",
+          "name": "Reference",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "Value",
+          "name": "Value",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Datasheet",
+          "name": "Datasheet",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Footprint",
+          "name": "Footprint",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Qty",
+          "name": "${QUANTITY}",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "DNP",
+          "name": "${DNP}",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "#",
+          "name": "${ITEM_NUMBER}",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Checked",
+          "name": "Checked",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Comment",
+          "name": "Comment",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "DigiKey",
+          "name": "DigiKey",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "LCSC",
+          "name": "LCSC",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "MANUFACTURER",
+          "name": "MANUFACTURER",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "MAXIMUM_PACKAGE_HEIGHT",
+          "name": "MAXIMUM_PACKAGE_HEIGHT",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "MPN",
+          "name": "MPN",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "PARTREV",
+          "name": "PARTREV",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Package",
+          "name": "Package",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Purchase",
+          "name": "Purchase",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "STANDARD",
+          "name": "STANDARD",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Description",
+          "name": "Description",
+          "show": false
+        }
+      ],
+      "filter_string": "",
+      "group_symbols": true,
+      "name": "",
+      "sort_asc": true,
+      "sort_field": "Reference"
+    },
+    "connection_grid_size": 50.0,
     "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
       "default_line_thickness": 6.0,
       "default_text_size": 50.0,
       "field_names": [],
@@ -406,6 +653,11 @@
       "intersheets_ref_suffix": "",
       "junction_size_choice": 3,
       "label_size_ratio": 0.375,
+      "operating_point_overlay_i_precision": 3,
+      "operating_point_overlay_i_range": "~A",
+      "operating_point_overlay_v_precision": 3,
+      "operating_point_overlay_v_range": "~V",
+      "overbar_offset_ratio": 1.23,
       "pin_symbol_size": 25.0,
       "text_offset_ratio": 0.15
     },
@@ -427,14 +679,19 @@
     "page_layout_descr_file": "",
     "plot_directory": "./",
     "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
     "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_dissipations": false,
+    "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
   },
   "sheets": [
     [
       "f40a33af-1f02-482d-8827-6bd150214691",
-      ""
+      "Root"
     ]
   ],
   "text_variables": {}

test-firmware/src/main.cpp

@@ -26,7 +26,7 @@ void setup() {
 
   digitalWrite(LED_BUILTIN, HIGH);
 
-  delay(100);
+  delay(200);
 
   for (int &pin : pins_to_test) {
     Serial.print("Waiting for pin ");
@@ -41,6 +41,8 @@ void setup() {
     delay(100);
     digitalWrite(LED_BUILTIN, HIGH);
   }
+
+  digitalWrite(LED_BUILTIN, LOW);
 #else
   digitalWrite(LED_BUILTIN, HIGH);
 
@@ -61,7 +63,7 @@ void loop() {
     Serial.println();
 
     digitalWrite(pin, HIGH);
-    delay(1000);
+    delay(300);
     digitalWrite(pin, LOW);
   }
 #endif

tools/README.md

@@ -0,0 +1,9 @@
+# Tools
+
+## `oem-flash.sh`
+
+This script is used before shipment to flash the Upsy Desky with the stock firmware, and to reprogram the CP2102 USB-to-serial chip with the correct name and serial (based on MAC address).
+
+## `test-flash.sh`
+
+Flashes the test firmware with PlatformIO (see `../test-firmware`).

tools/oem-flash.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+MAC_ADDR=$(esptool.py --chip esp32 read_mac | sed -En "s/MAC: (.*)/\1/p" | uniq | sed 's/://g')
+esphome upload --device /dev/cu.usbserial* ../firmware/stock.yaml
+
+if ! command -v cp210x-cfg &> /dev/null
+then
+  # Get cp210x-cfg from https://github.com/DiUS/cp210x-cfg
+  echo "cp210x-cfg was not found; CP2102 will not be serialized or renamed"
+else
+  cp210x-cfg -N "Upsy Desky" -S $MAC_ADDR
+fi

tools/test-flash.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+platformio run -d ../test-firmware --target upload --environment test_target

tools/tindie/.gitignore

@@ -0,0 +1 @@
+*.csv

tools/tindie/split-csv.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+rm -f ud_orders.csv ground_advantage_and_intl.csv priority.csv priority_express.csv pickup.csv
+
+csvq -o ud_orders.csv "SELECT * FROM all_orders WHERE \`Model Number\` LIKE \"%UPSY%\";"
+
+csvq -o ground_advantage_and_intl.csv "SELECT * FROM ud_orders WHERE \`Shipping Method\` LIKE \"%Ground Advantage%\" OR \`Shipping Method\` LIKE \"%Simple Export Rate%\" OR \`Shipping Method\` LIKE \"%First-Class Package International%\";"
+csvq -o priority.csv "SELECT * FROM ud_orders WHERE \`Shipping Method\` LIKE \"%Priority Mail%\" AND \`Shipping Method\` NOT LIKE \"%Priority Mail Express%\";"
+csvq -o priority_express.csv "SELECT * FROM ud_orders WHERE \`Shipping Method\` LIKE \"%Priority Mail Express%\";"
+csvq -o pickup.csv "SELECT * FROM ud_orders WHERE \`Shipping Method\` LIKE \"%Pickup%\";"
+
+SANITY_CHECK_QUERY=$(cat <<-END
+  SELECT
+    (SELECT count(*) from ud_orders)
+      =
+    (
+      (SELECT count(*) from ground_advantage_and_intl) +
+      (SELECT count(*) from priority) +
+      (SELECT count(*) from priority_express) +
+      (SELECT count(*) from pickup)
+    )
+  AS SanityCheck;
+END
+)
+
+csvq "$SANITY_CHECK_QUERY"