mirror of
https://github.com/tjhorner/upsy-desky.git
synced 2026-01-10 15:58:02 -05:00
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
931edac2a5 | ||
|
|
6a5fbfa383 | ||
|
|
e334e7004f | ||
|
|
c36fcb5232 | ||
|
|
a4484761cd | ||
|
|
7bf1275e7d | ||
|
|
b28dcb26ca | ||
|
|
0ae038b8b7 | ||
|
|
543f901d90 | ||
|
|
f3b31ecc61 | ||
|
|
9bcd331a3d | ||
|
|
88f5110e62 | ||
|
|
4a1289de03 | ||
|
|
6626be4545 | ||
|
|
bd416f2ea7 | ||
|
|
54384fe695 |
50
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
50
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
@@ -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
|
||||
40
.github/workflows/nightly-build.yaml
vendored
Normal file
40
.github/workflows/nightly-build.yaml
vendored
Normal file
@@ -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 --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 }}"
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
substitutions:
|
||||
bluetooth_proxy_active_connections: "true"
|
||||
|
||||
esp32_ble_tracker:
|
||||
|
||||
bluetooth_proxy:
|
||||
active: true
|
||||
active: ${bluetooth_proxy_active_connections}
|
||||
|
||||
@@ -12,7 +12,7 @@ esphome:
|
||||
data: [ 0x0 ]
|
||||
project:
|
||||
name: tj_horner.upsy_desky
|
||||
version: "1.0.3"
|
||||
version: "1.2.0"
|
||||
|
||||
uart:
|
||||
id: handset_tx
|
||||
@@ -50,7 +50,6 @@ packages:
|
||||
addon_presets: !include addons/presets.yaml
|
||||
addon_stable_ids: !include addons/stable-ids.yaml
|
||||
addon_runtime_config: !include addons/runtime-config.yaml
|
||||
addon_bluetooth_proxy: !include addons/bluetooth-proxy.yaml
|
||||
|
||||
button:
|
||||
- platform: restart
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
packages:
|
||||
base: !include base.yaml
|
||||
addon_bluetooth_proxy: !include addons/bluetooth-proxy.yaml
|
||||
|
||||
substitutions:
|
||||
bluetooth_proxy_active_connections: "false"
|
||||
|
||||
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 +25,18 @@ captive_portal:
|
||||
|
||||
improv_serial:
|
||||
|
||||
esp32_improv:
|
||||
authorizer: false
|
||||
|
||||
api:
|
||||
password: ""
|
||||
reboot_timeout: 0s
|
||||
|
||||
web_server:
|
||||
port: 80
|
||||
js_url: "https://upsy-desky.tjhorner.dev/esphome-webserver/www.js"
|
||||
|
||||
ota:
|
||||
password: ""
|
||||
|
||||
dashboard_import:
|
||||
package_import_url: github://tjhorner/upsy-desky/firmware/stock.yaml@v1.0.3
|
||||
package_import_url: github://tjhorner/upsy-desky/firmware/stock.yaml@v1.1.1
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
#!/bin/bash
|
||||
|
||||
rm -f first_class_and_intl.csv priority.csv priority_express.csv pickup.csv
|
||||
rm -f ud_orders.csv first_class_and_intl.csv priority.csv priority_express.csv pickup.csv
|
||||
|
||||
csvq -o first_class_and_intl.csv "SELECT * FROM all_orders WHERE \`Shipping Method\` LIKE \"%First-Class%\" OR \`Shipping Method\` LIKE \"%Simple Export Rate%\";"
|
||||
csvq -o priority.csv "SELECT * FROM all_orders WHERE \`Shipping Method\` LIKE \"%Priority Mail%\" AND \`Shipping Method\` NOT LIKE \"%Priority Mail Express%\";"
|
||||
csvq -o priority_express.csv "SELECT * FROM all_orders WHERE \`Shipping Method\` LIKE \"%Priority Mail Express%\";"
|
||||
csvq -o pickup.csv "SELECT * FROM all_orders WHERE \`Shipping Method\` LIKE \"%Pickup%\";"
|
||||
csvq -o ud_orders.csv "SELECT * FROM all_orders WHERE \`Model Number\` LIKE \"%UPSY%\";"
|
||||
|
||||
csvq -o first_class_and_intl.csv "SELECT * FROM ud_orders WHERE \`Shipping Method\` LIKE \"%First-Class%\" OR \`Shipping Method\` LIKE \"%Simple Export Rate%\";"
|
||||
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 all_orders)
|
||||
(SELECT count(*) from ud_orders)
|
||||
=
|
||||
(
|
||||
(SELECT count(*) from first_class_and_intl) +
|
||||
|
||||
Reference in New Issue
Block a user