Skip to content

Commit

Permalink
20240524
Browse files Browse the repository at this point in the history
- Add a workflow for expressing gratitude after the merge
- Try to fix ZB FW value is 0 #10
- Fix CZ language typo Thanks to @leroyloren 🚀 #25
- Fix warning in HA about the missing attribute #15
- Renamed cs.json to cz.json to to comply with standard names accepted in i18next
- Add Čeština translation. Thanks to @leroyloren 🚀 #19
- Fixed type error on login page Thanks to @mercenaruss 🚀 #18
- Add TubeZB config option. Thanks to @mercenaruss 🚀 #17
  • Loading branch information
xyzroe committed May 24, 2024
1 parent c526dce commit d3dbe70
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/merge_comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Add merge comment

on:
pull_request:
types: [closed]

jobs:
add-merge-comment:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
steps:
- name: Add comment to merged pull request
uses: actions/github-script@v6
with:
script: |
const pull_request = context.payload.pull_request;
const author = pull_request.user.login;
const issue_number = pull_request.number;
const body = `Thanks @${author} 🚀`;
await github.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue_number,
body: body
});
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 6 additions & 2 deletions src/mqtt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ String getWlanIp()
}

String getWlanSsid()
{
return String(WiFi.SSID());
{
String ssid = WiFi.SSID();
if (ssid.isEmpty()) {
ssid = "-";
}
return ssid;
}

String getWlanRssi()
Expand Down
13 changes: 11 additions & 2 deletions src/zb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,17 @@ bool zbFwCheck()
}
else
{
printLogMsg(tag_ZB + " fw: unknown!");
return false;
delay(250);
if (CCTool.checkFirmwareVersion())
{
printLogMsg(tag_ZB + " fw: " + String(CCTool.chip.fwRev));
return true;
}
else
{
printLogMsg(tag_ZB + " fw: unknown!");
return false;
}
}
}

Expand Down

0 comments on commit d3dbe70

Please sign in to comment.