Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
helgeerbe committed Aug 10, 2023
2 parents 3702fb3 + 7c7a15e commit 4873041
Showing 5 changed files with 14 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -5,8 +5,6 @@ on:
paths-ignore:
- docs/**
- '**/*.md'
tags-ignore:
- v*
pull_request:
paths-ignore:
- docs/**
1 change: 1 addition & 0 deletions include/WebApi_ws_vedirect_live.h
Original file line number Diff line number Diff line change
@@ -23,4 +23,5 @@ class WebApiWsVedirectLiveClass {
uint32_t _lastVedirectUpdateCheck = 0;
uint32_t _lastWsCleanup = 0;
uint32_t _newestVedirectTimestamp = 0;
static constexpr uint16_t _responseSize = 1024 + 128;
};
12 changes: 8 additions & 4 deletions pio-scripts/auto_firmware_version.py
Original file line number Diff line number Diff line change
@@ -18,14 +18,18 @@
def get_firmware_specifier_build_flag():
try:
build_version = porcelain.describe('.') # '.' refers to the repository root dir
branch_name = porcelain.active_branch('.').decode('utf-8')
except:
except Exception as err:
print(f"Unexpected {err=}, {type(err)=}")
build_version = "g0000000"
try:
branch_name = porcelain.active_branch('.').decode('utf-8') # '.' refers to the repository root dir
except Exception as err:
print(f"Unexpected {err=}, {type(err)=}")
branch_name = ""
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\" "
build_flag += "-D AUTO_GIT_BRANCH=\\\"" + branch_name + "\\\""
print ("Firmware Revision: " + build_version)
print ("Firmware build on branch: " + branch_name)
print("Firmware Revision: " + build_version)
print("Firmware build on branch: " + branch_name)
return (build_flag)

env.Append(
4 changes: 2 additions & 2 deletions src/WebApi_ws_vedirect_live.cpp
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ void WebApiWsVedirectLiveClass::loop()
String buffer;
// free JsonDocument as soon as possible
{
DynamicJsonDocument root(2048);
DynamicJsonDocument root(_responseSize);
JsonVariant var = root;
generateJsonResponse(var);
serializeJson(root, buffer);
@@ -173,7 +173,7 @@ void WebApiWsVedirectLiveClass::onLivedataStatus(AsyncWebServerRequest* request)
return;
}
try {
AsyncJsonResponse* response = new AsyncJsonResponse(false, 1024U);
AsyncJsonResponse* response = new AsyncJsonResponse(false, _responseSize);
JsonVariant root = response->getRoot();

generateJsonResponse(root);
10 changes: 3 additions & 7 deletions webapp/src/views/HomeView.vue
Original file line number Diff line number Diff line change
@@ -114,13 +114,9 @@
</div>
</div>
</div>
<VedirectView v-show="liveData.vedirect.enabled" />
<div v-show="liveData.battery.enabled" >
<BatteryView/>
</div>
<div v-show="liveData.huawei.enabled" >
<HuaweiView/>
</div>
<VedirectView v-if="liveData.vedirect.enabled" />
<BatteryView v-if="liveData.battery.enabled" />
<HuaweiView v-if="liveData.huawei.enabled" />
</BasePage>

<div class="modal" id="eventView" tabindex="-1">

0 comments on commit 4873041

Please sign in to comment.