Skip to content

Commit

Permalink
20240508
Browse files Browse the repository at this point in the history
Web UI:
- Adjust mobile view of CC2652 role selection card
- Move mode selection card to page bottom

Build and deploy:
- Make manifests for tags not versions
- Add release info in TG message
  • Loading branch information
xyzroe committed May 8, 2024
1 parent 8f260b9 commit 2dad5fc
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 109 deletions.
47 changes: 28 additions & 19 deletions .github/workflows/build_fw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ jobs:
echo "releaseMessage<<EOF" >> $GITHUB_ENV
printf "%s\n" "$fullCommitMessage" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
echo "commitMessage<<EOF" >> $GITHUB_ENV
printf "%s\n" "$commitMessage" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
env:
GITHUB_REF: ${{ github.ref }}

Expand All @@ -74,14 +77,14 @@ jobs:
cat << EOF > manifest.json
{
"name": "XZG Firmware",
"version": "${{ steps.get_version.outputs.version }}",
"version": "${{ steps.get_tag.outputs.tag }}",
"builds": [
{
"chipFamily": "ESP32",
"improv": false,
"parts": [
{
"path": "https://raw.githubusercontent.com/${{ github.repository }}/releases/${{ steps.get_version.outputs.version }}/XZG_${{ steps.get_version.outputs.version }}.full.bin",
"path": "https://raw.githubusercontent.com/${{ github.repository }}/releases/${{ steps.get_tag.outputs.tag }}/XZG_${{ steps.get_version.outputs.version }}.full.bin",
"offset": 0
}
]
Expand All @@ -101,18 +104,6 @@ jobs:
bin/XZG_${{ steps.get_version.outputs.version }}.ota.bin
bin/XZG_${{ steps.get_version.outputs.version }}.full.bin
- name: Send Telegram Notification about release
run: |
curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
-d chat_id="${{ secrets.TELEGRAM_CHAT_ID }}" \
-d parse_mode="MarkdownV2" \
-d message_thread_id=14 \
-d text="[${{ steps.get_tag.outputs.tag }}](https://github.com/${{ github.repository }}/releases/tag/${{ steps.get_tag.outputs.tag }})" \
-d link_preview_options='{
"show_above_text": true,
"prefer_large_media": false
}'
- name: Checkout releases branch
uses: actions/checkout@v3
with:
Expand All @@ -121,9 +112,9 @@ jobs:

- name: Copy files to releases directory
run: |
mkdir -p releases/${{ steps.get_version.outputs.version }}
cp ./bin/XZG_${{ steps.get_version.outputs.version }}.full.bin releases/${{ steps.get_version.outputs.version }}/
cp manifest.json releases/${{ steps.get_version.outputs.version }}/
mkdir -p releases/${{ steps.get_tag.outputs.tag }}
cp ./bin/XZG_${{ steps.get_version.outputs.version }}.full.bin releases/${{ steps.get_tag.outputs.tag }}/
cp manifest.json releases/${{ steps.get_tag.outputs.tag }}/
echo "Files copied to releases directory."
- name: Commit and push files to releases branch
Expand All @@ -132,5 +123,23 @@ jobs:
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add .
git commit -m "Add firmware and manifest for version ${{ steps.get_version.outputs.version }}"
git push origin releases
git commit -m "Add firmware and manifest for version ${{ steps.get_tag.outputs.tag }}"
git push origin releases
- name: Send Telegram Notification about release
run: |
escaped_tag=$(echo "${{ steps.get_tag.outputs.tag }}" | sed -E 's/([._*[\]()~`>#+-=|{}.!])/\\\1/g')
escaped_commit_message=$(echo "${{ env.commitMessage }}" | sed -E 's/([._*[\]()~`>#+-=|{}.!])/\\\1/g')
message_text="[${escaped_tag}](https://github.com/${{ github.repository }}/releases/tag/${escaped_tag})\n\n${escaped_commit_message}"
curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
-d chat_id="${{ secrets.TELEGRAM_CHAT_ID }}" \
-d parse_mode="MarkdownV2" \
-d message_thread_id=14 \
-d text="[${{ steps.get_tag.outputs.tag }}](https://github.com/${{ github.repository }}/releases/tag/${escaped_tag})" \
-d link_preview_options='{
"show_above_text": true,
"prefer_large_media": true
}'
19 changes: 19 additions & 0 deletions src/websrc/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,8 @@ body {
--coordinator-color: 255, 0, 0;
--default-opacity: 0.25;
--selected-opacity: 1.0;
margin: 0 auto !important;
max-width: 700px !important;
}

.selectable-card {
Expand Down Expand Up @@ -602,6 +604,23 @@ body {
font-weight: bolder;
}

@media (max-width: 768px) {
.card-label {
font-size: 1em;
}

.large-icon {
width: 2em;
height: 2em;
}
}

@media (max-width: 576px) {
.card-label {
font-size: 0.7em;
}
}

.selectable-card.selected, .selectable-card:hover {
border: 3px solid var(--text-color) !important;
}
Expand Down
174 changes: 84 additions & 90 deletions src/websrc/html/PAGE_ZIGBEE.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,85 @@
<div id='main'>
<div class="col-12 cardPadding">
<div class='card'>
<div class="card-header fw-bold">
<svg class="card_icon" fill="currentColor" viewBox="0 0 16 16">
<use xlink:href="icons.svg#magic" />
</svg><span data-i18n="p.zi.cfg.tt"></span>
</div>
<div class='card-body'>
<div class="row">
<div class='col-sm-12'>
<div class='form-group'>
<div class="alert alert-warning visually-hidden" role="alert" id="apAlert"
data-i18n="p.zi.cfg.alarm">
</div>
<label for='generatedFile' data-i18n="p.zi.cfg.sel"></label>
<label>
<div class="ms-1 form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="z2m" checked
onclick="generateConfig(this.id)">
<label class="form-check-label" for="z2m">Zigbee2MQTT</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="zha"
onclick="generateConfig(this.id)">
<label class="form-check-label" for="zha">ZHA</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="usb"
onclick="generateConfig(this.id)">
<label class="form-check-label" for="usb">USB</label>
</div>
</label>
<textarea class="form-control mb-2" id="generatedFile" name="file" rows="12"></textarea>
<button type="button" class="btn btn-outline-primary col-sm-12 col-md-4"
onclick="copyCode()"><svg class="card_icon" viewBox="0 0 16 16">
<use id="clipIco" xlink:href="icons.svg#clipboard2" />
</svg><span data-i18n="c.cc"></span></button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 cardPadding">
<form class="saveParams" method='POST' action="saveParams">
<div class='card'>
<div class="card-header fw-bold">
<svg class="card_icon" fill="currentColor" viewBox="0 0 16 16">
<use xlink:href="icons.svg#activity" />
</svg><span data-i18n="p.zi.so"></span>
</div>
<div class='card-body'>
<div class="row">
<div class='col-sm-12 col-md-6 mb-4'>
<div class='form-group'>
<label for='baud' data-i18n="p.zi.ss"></label>
<select class='form-select' id='baud' name='baud'>
<option data-r2v="9600" value='9600'>9600 bauds</option>
<option data-r2v="19200" value='19200'>19200 bauds</option>
<option data-r2v="38400" value='38400'>38400 bauds</option>
<option data-r2v="57600" value='57600'>57600 bauds</option>
<option data-r2v="115200" value='115200'>115200 bauds</option>
</select>
</div>
</div>
<div class='col-sm-12 col-md-6 mb-4'>
<div class='form-group'>
<label for='port' data-i18n="p.zi.sp"></label>
<input data-r2v="socketPort" class='form-control' id='port' type='number' name='port'
min='100' max='65000'>
</div>
</div>
</div>
<div class="col-12 d-flex justify-content-center">
<button type="submit" class="btn btn-outline-primary col-6" name='save'
data-i18n="c.save"></button>
</div>
</div>
</div>
</form>
</div>
<div class="col-12 cardPadding">
<div class='card'>
<div class="card-header fw-bold">
Expand All @@ -12,7 +93,7 @@
<div class="alert alert-danger" role="alert" id="apAlert" data-i18n="p.zi.fws.alarm">
</div>
<div class="row justify-content-center my-4 zb_cards">
<div class="col-2">
<div class="col-4">
<div class="card selectable-card zfs_coordinator">
<div class="card-body text-center card-label">
<svg class="large-icon" fill="currentColor" viewBox="0 0 16 16">
Expand All @@ -22,8 +103,7 @@
</div>
</div>
</div>
<div class="col-1"></div>
<div class="col-2">
<div class="col-4">
<div class="card selectable-card zfs_router">
<div class="card-body text-center card-label">
<svg class="large-icon" fill="currentColor" viewBox="0 0 16 16">
Expand All @@ -33,8 +113,7 @@
</div>
</div>
</div>
<div class="col-1"></div>
<div class="col-2">
<div class="col-4">
<div class="card selectable-card zfs_thread">
<div class="card-body text-center card-label">
<svg class="large-icon" fill="currentColor" viewBox="0 0 16 16">
Expand Down Expand Up @@ -110,90 +189,5 @@
console.error(error);
});
}



</script>
<div class="col-12 cardPadding">
<div class='card'>
<div class="card-header fw-bold">
<svg class="card_icon" fill="currentColor" viewBox="0 0 16 16">
<use xlink:href="icons.svg#magic" />
</svg><span data-i18n="p.zi.cfg.tt"></span>
</div>
<div class='card-body'>
<div class="row">
<div class='col-sm-12'>
<div class='form-group'>
<div class="alert alert-warning visually-hidden" role="alert" id="apAlert"
data-i18n="p.zi.cfg.alarm">
</div>
<label for='generatedFile' data-i18n="p.zi.cfg.sel"></label>
<label>
<div class="ms-1 form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="z2m" checked
onclick="generateConfig(this.id)">
<label class="form-check-label" for="z2m">Zigbee2MQTT</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="zha"
onclick="generateConfig(this.id)">
<label class="form-check-label" for="zha">ZHA</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="generatorType" id="usb"
onclick="generateConfig(this.id)">
<label class="form-check-label" for="usb">USB</label>
</div>
</label>
<textarea class="form-control mb-2" id="generatedFile" name="file" rows="12"></textarea>
<button type="button" class="btn btn-outline-primary col-sm-12 col-md-4"
onclick="copyCode()"><svg class="card_icon" viewBox="0 0 16 16">
<use id="clipIco" xlink:href="icons.svg#clipboard2" />
</svg><span data-i18n="c.cc"></span></button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 cardPadding">
<form class="saveParams" method='POST' action="saveParams">
<div class='card'>
<div class="card-header fw-bold">
<svg class="card_icon" fill="currentColor" viewBox="0 0 16 16">
<use xlink:href="icons.svg#activity" />
</svg><span data-i18n="p.zi.so"></span>
</div>
<div class='card-body'>
<div class="row">
<div class='col-sm-12 col-md-6 mb-4'>
<div class='form-group'>
<label for='baud' data-i18n="p.zi.ss"></label>
<select class='form-select' id='baud' name='baud'>
<option data-r2v="9600" value='9600'>9600 bauds</option>
<option data-r2v="19200" value='19200'>19200 bauds</option>
<option data-r2v="38400" value='38400'>38400 bauds</option>
<option data-r2v="57600" value='57600'>57600 bauds</option>
<option data-r2v="115200" value='115200'>115200 bauds</option>
</select>
</div>
</div>
<div class='col-sm-12 col-md-6 mb-4'>
<div class='form-group'>
<label for='port' data-i18n="p.zi.sp"></label>
<input data-r2v="socketPort" class='form-control' id='port' type='number' name='port'
min='100' max='65000'>
</div>
</div>
</div>
<div class="col-12 d-flex justify-content-center">
<button type="submit" class="btn btn-outline-primary col-6" name='save'
data-i18n="c.save"></button>
</div>
</div>
</div>
</form>
</div>

</div>

0 comments on commit 2dad5fc

Please sign in to comment.