mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 19:46:54 +03:00
Compare commits
128 Commits
v16-0-0-RC
...
log-mqtt-c
| Author | SHA1 | Date | |
|---|---|---|---|
|
4e1df4a0db | ||
|
|
b34fdd937b | ||
|
|
775f9dcb14 | ||
|
|
c352e539bc | ||
|
|
47c5a92648 | ||
|
|
a0333d906f | ||
|
|
ec00e943da | ||
|
|
6175471a00 | ||
|
|
948e76876f | ||
|
|
f4edb206d8 | ||
|
|
a9db769595 | ||
|
|
f0497eb924 | ||
|
|
e53af6de0d | ||
|
|
3b7fe93d02 | ||
|
|
2f1d7e577c | ||
|
|
2a7247abfe | ||
|
|
37ba85717f | ||
|
|
97656114b6 | ||
|
|
6cf1d5ad98 | ||
|
|
fed729bcee | ||
|
|
89c36374b3 | ||
|
|
bb69929247 | ||
|
|
e1ea09c501 | ||
|
|
39a827258d | ||
|
|
1d8c6fa257 | ||
|
|
a9aadbdb06 | ||
|
|
a5927f98d2 | ||
|
|
c708e2374a | ||
|
|
4c3dcd8c29 | ||
|
|
be93567956 | ||
|
|
d4406f47ea | ||
|
|
52efedcfa0 | ||
|
|
28d93253f0 | ||
|
|
c7fdc46df2 | ||
|
|
74491e9bde | ||
|
|
a092142c65 | ||
|
|
f6a3dc5851 | ||
|
|
d027adf006 | ||
|
|
bd5be5c5ec | ||
|
|
3b3a3ebcc9 | ||
|
|
7d62cf67fe | ||
|
|
f6bdd48bca | ||
|
|
5496573369 | ||
|
|
4522ba087f | ||
|
|
d370ba5fe6 | ||
|
|
f39dacc1c5 | ||
|
|
aad1a0e78d | ||
|
|
276efef783 | ||
|
|
79476a8458 | ||
|
|
2b7da5b44e | ||
|
|
ebcec97d1d | ||
|
|
85375b6505 | ||
|
|
085c47b651 | ||
|
|
20a04b888f | ||
|
|
098b1bd025 | ||
|
|
d1c815ce69 | ||
|
|
67c3020d7d | ||
|
|
61bca4ebb8 | ||
|
|
3219202c53 | ||
|
|
cd29690b96 | ||
|
|
3a34564ee2 | ||
|
|
174743ae7f | ||
|
|
e5eca6a53f | ||
|
|
d8e37dce48 | ||
|
|
822753bb4f | ||
|
|
7225792b4b | ||
|
|
b4f6b1a4fb | ||
|
|
21ec58daa0 | ||
|
|
2c69e90fac | ||
|
|
5c57522b71 | ||
|
|
f8eb4db171 | ||
|
|
c9a3df4eec | ||
|
|
acf669900f | ||
|
|
cb3f082218 | ||
|
|
20980b2bcd | ||
|
|
773d21a875 | ||
|
|
3a9c9ac2a4 | ||
|
|
c7e340d3a5 | ||
|
|
0441753a33 | ||
|
|
fb6cb44728 | ||
|
|
ae69942dd9 | ||
|
|
65437727f7 | ||
|
|
ccefe57795 | ||
|
|
e3ff049720 | ||
|
|
39e84baf8b | ||
|
|
eb7d078a1a | ||
|
|
b6c6805a08 | ||
|
|
d567a5d7f2 | ||
|
|
6922970185 | ||
|
|
9a4b51d6de | ||
|
|
2546ab81ff | ||
|
|
7b7544079f | ||
|
|
17fe87b349 | ||
|
|
f99dc8fdfc | ||
|
|
cce992754c | ||
|
|
eefccf6e11 | ||
|
|
64bb4f0ff6 | ||
|
|
f534741205 | ||
|
|
ee38bc7dc6 | ||
|
|
132834c3fd | ||
|
|
d3d9c64f3b | ||
|
|
aa2a4edf7e | ||
|
|
8012b7f43e | ||
|
|
009ab4c896 | ||
|
|
c54ca18e4e | ||
|
|
beb09593eb | ||
|
|
1a76ae121c | ||
|
|
1300242d4a | ||
|
|
79543df23b | ||
|
|
4049d752ba | ||
|
|
dc90972659 | ||
|
|
32282ecfe2 | ||
|
|
ae6a94544b | ||
|
|
70b031eacc | ||
|
|
c3fadf5c2a | ||
|
|
7e5f6bf4a5 | ||
|
|
88b531ae8b | ||
|
|
8481cc4b26 | ||
|
|
ecaed38c1d | ||
|
|
d6a1838d47 | ||
|
|
5194c466be | ||
|
|
043de9265a | ||
|
|
08a350172d | ||
|
|
7e806df64d | ||
|
|
dccfb5e91e | ||
|
|
fbe4609bb9 | ||
|
|
3e85cfb456 | ||
|
|
5dff4ca8cf |
12
.github/workflows/build.yaml
vendored
12
.github/workflows/build.yaml
vendored
@@ -331,13 +331,11 @@ jobs:
|
||||
|
||||
# extract the version used in next step
|
||||
- id: get_version
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
uses: Simply007/get-version-action@v2
|
||||
uses: drewg13/get-version-action@98dda2a47a257e202c2e6c2ed2e6072ec23f448e
|
||||
|
||||
# # the changelog [unreleased] will now be changed to the release version
|
||||
# - name: Update changelog
|
||||
# uses: thomaseizinger/keep-a-changelog-new-release@v1
|
||||
# if: startsWith(github.ref, 'refs/tags/')
|
||||
# with:
|
||||
# changelogPath: Changelog.md
|
||||
# version: ${{ steps.get_version.outputs.version-without-v }}
|
||||
@@ -345,7 +343,6 @@ jobs:
|
||||
# # the release notes will be extracted from changelog
|
||||
# - name: Extract release notes
|
||||
# id: extract-release-notes
|
||||
# if: startsWith(github.ref, 'refs/tags/')
|
||||
# uses: ffurrer2/extract-release-notes@v1
|
||||
# with:
|
||||
# changelog_file: Changelog.md
|
||||
@@ -353,12 +350,11 @@ jobs:
|
||||
# Releases should only be created on master by tagging the last commit.
|
||||
# all artifacts in firmware folder pushed to the release
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
uses: softprops/action-gh-release@v2.0.8
|
||||
# Note:
|
||||
# If you get the error "Resource not accessible by integration",
|
||||
# The access rights are not sufficient, see
|
||||
# https://github.com/softprops/action-gh-release/issues/232#issuecomment-1131379440
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
with:
|
||||
name: ${{ steps.get_version.outputs.version-without-v }}
|
||||
body: ${{ steps.extract-release-notes.outputs.release_notes }}
|
||||
@@ -367,7 +363,6 @@ jobs:
|
||||
|
||||
# # Commit&Push Changelog to master branch. Must be manually merged back to rolling
|
||||
# - name: Commit changes and push changes
|
||||
# if: startsWith(github.ref, 'refs/tags/')
|
||||
# run: |
|
||||
# git config user.name github-actions
|
||||
# git config user.email github-actions@github.com
|
||||
@@ -380,7 +375,8 @@ jobs:
|
||||
## Update the Web Installer on a release
|
||||
#########################################################################################
|
||||
# Make sure to also update update-webinstaller.yml!
|
||||
update-web-installer:
|
||||
update-web-installer:
|
||||
if: github.event_name == 'release' && github.event.action == 'published' # Only run on release but not on prerelease
|
||||
needs: [release]
|
||||
environment:
|
||||
name: github-pages
|
||||
|
||||
38
Changelog.md
38
Changelog.md
@@ -1,3 +1,41 @@
|
||||
## [16.0.0-RC3] - 2024-10-05
|
||||
|
||||
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.7.0...v16.0.0-RC1)
|
||||
|
||||
#### Known issues
|
||||
Please check the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and
|
||||
[discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions) before reporting a new issue.
|
||||
|
||||
#### Core Changes
|
||||
Only changes since RC2 are listed:
|
||||
- Renamed MQTT topic from `rate_per_digitalization_round` to `rate_per_digitization_round` (change happened already in RC1)
|
||||
|
||||
#### Bug Fixes
|
||||
Only changes since RC2 are listed:
|
||||
- Re-did revertion of TFlite submodule update as certain modules crash with it (#3269) (change was lost)
|
||||
|
||||
|
||||
## [16.0.0-RC2] - 2024-10-04
|
||||
|
||||
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.7.0...v16.0.0-RC1)
|
||||
|
||||
#### Known issues
|
||||
Please check the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and
|
||||
[discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions) before reporting a new issue.
|
||||
|
||||
#### Core Changes
|
||||
Only changes since RC1 are listed:
|
||||
- Updated parameter documentation pages
|
||||
- Rename/remove unused parameters (#3291)
|
||||
- Migrate-cam-parameters (#3288)
|
||||
|
||||
#### Bug Fixes
|
||||
Only changes since RC1 are listed:
|
||||
- Reverted TFlite submodule update as certain modules crash with it (#3269)
|
||||
- Changed the webhook UploadImg to false (#3279)
|
||||
- Changed default value from boolean to numeric value in parameter camDenoise documentation
|
||||
- Updated config page
|
||||
|
||||
## [16.0.0-RC1] - 2024-09-24
|
||||
|
||||
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.7.0...v16.0.0-RC1)
|
||||
|
||||
@@ -65,7 +65,7 @@ The latest available version can be found on the [Releases page](https://github.
|
||||
Initially you will have to flash the ESP32 via a USB connection. Later updates are possible directly over the air (OTA using WIFI).
|
||||
|
||||
There are different ways to flash your ESP32:
|
||||
- The prefered way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html) which is a browser-based tool to flash the ESP32 and extract the log over USB:
|
||||
- The preferred way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html) which is a browser-based tool to flash the ESP32 and extract the log over USB:
|
||||
|
||||
- Flash Tool from Espressif
|
||||
- ESPtool (command-line tool)
|
||||
|
||||
Submodule code/components/esp-tflite-micro updated: 0032f1734e...13f26b8294
@@ -286,7 +286,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
|
||||
|
||||
if (resultchangabs.length() > 0) {
|
||||
success |= MQTTPublish(namenumber + "changeabsolut", resultchangabs, qos, SetRetainFlag); // Legacy API
|
||||
success |= MQTTPublish(namenumber + "rate_per_Digitization_round", resultchangabs, qos, SetRetainFlag);
|
||||
success |= MQTTPublish(namenumber + "rate_per_digitization_round", resultchangabs, qos, SetRetainFlag);
|
||||
}
|
||||
|
||||
if (resultraw.length() > 0)
|
||||
|
||||
@@ -174,8 +174,7 @@ static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) {
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Connection refused, not authorized. Check username/password (0x05)");
|
||||
}
|
||||
else {
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Other event id:" + event->error_handle->connect_return_code);
|
||||
ESP_LOGE(TAG, "Other event id:%d", event->error_handle->connect_return_code);
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Connection Refused with unknown event id:" + std::to_string(event->error_handle->connect_return_code));
|
||||
}
|
||||
|
||||
#ifdef DEBUG_DETAIL_ON
|
||||
|
||||
@@ -188,10 +188,10 @@ bool MQTThomeassistantDiscovery(int qos) {
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "value", "Value", "gauge", valueUnit, meterType, "total_increasing", "", qos);
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "raw", "Raw Value", "raw", "", "", "", "diagnostic", qos);
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "error", "Error", "alert-circle-outline", "", "", "", "diagnostic", qos);
|
||||
/* Not announcing "rate" as it is better to use rate_per_time_unit resp. rate_per_Digitization_round */
|
||||
/* Not announcing "rate" as it is better to use rate_per_time_unit resp. rate_per_digitization_round */
|
||||
// allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "rate", "Rate (Unit/Minute)", "swap-vertical", "", "", "", ""); // Legacy, always Unit per Minute
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "rate_per_time_unit", "Rate (" + rateUnit + ")", "swap-vertical", rateUnit, "", "measurement", "", qos);
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "rate_per_Digitization_round", "Change since last Digitization round", "arrow-expand-vertical", valueUnit, "", "measurement", "", qos); // correctly the Unit is Unit/Interval!
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "rate_per_digitization_round", "Change since last Digitization round", "arrow-expand-vertical", valueUnit, "", "measurement", "", qos); // correctly the Unit is Unit/Interval!
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "timestamp", "Timestamp", "clock-time-eight-outline", "", "timestamp", "", "diagnostic", qos);
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "json", "JSON", "code-json", "", "", "", "diagnostic", qos);
|
||||
allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group, "problem", "Problem", "alert-outline", "", "problem", "", "", qos); // Special binary sensor which is based on error topic
|
||||
|
||||
@@ -528,30 +528,44 @@ extern "C" void app_main(void)
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: needs to be revised or removed!!!
|
||||
void migrateConfiguration(void) {
|
||||
std::vector<string> splitted;
|
||||
bool migrated = false;
|
||||
|
||||
bool CamZoom_found = false;
|
||||
int CamZoom_lines = 0;
|
||||
bool CamZoom_value = false;
|
||||
int CamZoomSize_lines = 0;
|
||||
int CamZoomSize_value = 0;
|
||||
int CamZoomOffsetX_lines = 0;
|
||||
int CamZoomOffsetX_value = 0;
|
||||
int CamZoomOffsetY_lines = 0;
|
||||
int CamZoomOffsetY_value = 0;
|
||||
|
||||
if (!FileExists(CONFIG_FILE)) {
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Config file seems to be missing!");
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
std::string section = "";
|
||||
std::ifstream ifs(CONFIG_FILE);
|
||||
std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
|
||||
|
||||
std::ifstream ifs(CONFIG_FILE);
|
||||
std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
|
||||
|
||||
/* Split config file it array of lines */
|
||||
std::vector<std::string> configLines = splitString(content);
|
||||
|
||||
/* Process each line */
|
||||
for (int i = 0; i < configLines.size(); i++) {
|
||||
//ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str());
|
||||
// ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str());
|
||||
|
||||
if (configLines[i].find("[") != std::string::npos) { // Start of new section
|
||||
if (configLines[i].find("[") != std::string::npos) {
|
||||
// Start of new section
|
||||
section = configLines[i];
|
||||
replaceString(section, ";", "", false); // Remove possible semicolon (just for the string comparison)
|
||||
//ESP_LOGI(TAG, "New section: %s", section.c_str());
|
||||
// ESP_LOGI(TAG, "New section: %s", section.c_str());
|
||||
}
|
||||
else {
|
||||
splitted = ZerlegeZeile(configLines[i]);
|
||||
}
|
||||
|
||||
/* Migrate parameters as needed
|
||||
@@ -569,119 +583,154 @@ void migrateConfiguration(void) {
|
||||
}
|
||||
|
||||
if (section == "[MakeImage]" || section == "[TakeImage]") {
|
||||
migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation");
|
||||
migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention");
|
||||
if ((isInString(configLines[i], "Brightness")) && (!isInString(configLines[i], "CamBrightness"))) {
|
||||
migrated = migrated | replaceString(configLines[i], "Brightness", "CamBrightness");
|
||||
}
|
||||
else if ((isInString(configLines[i], "Contrast")) && (!isInString(configLines[i], "CamContrast"))) {
|
||||
migrated = migrated | replaceString(configLines[i], "Contrast", "CamContrast");
|
||||
}
|
||||
else if ((isInString(configLines[i], "Saturation")) && (!isInString(configLines[i], "CamSaturation"))) {
|
||||
migrated = migrated | replaceString(configLines[i], "Saturation", "CamSaturation");
|
||||
}
|
||||
else if ((isInString(configLines[i], "Sharpness")) && (!isInString(configLines[i], "CamSharpness")) && (!isInString(configLines[i], "CamAutoSharpness"))) {
|
||||
migrated = migrated | replaceString(configLines[i], "Sharpness", "CamSharpness");
|
||||
}
|
||||
else if ((isInString(configLines[i], "Aec2")) && (!isInString(configLines[i], "CamAec")) && (!isInString(configLines[i], "CamAec2"))) {
|
||||
migrated = migrated | replaceString(configLines[i], "Aec2", "CamAec2");
|
||||
}
|
||||
else if ((isInString(configLines[i], "Zoom")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "ZoomOffsetY"))) {
|
||||
CamZoom_lines = i;
|
||||
CamZoom_value = alphanumericToBoolean(splitted[1]);
|
||||
CamZoom_found = true;
|
||||
}
|
||||
else if ((isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "CamZoom"))) {
|
||||
CamZoomSize_lines = i;
|
||||
if (isStringNumeric(splitted[1])) {
|
||||
CamZoomSize_value = std::stof(splitted[1]);
|
||||
}
|
||||
CamZoom_found = true;
|
||||
}
|
||||
else if ((isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetY"))) {
|
||||
CamZoomOffsetX_lines = i;
|
||||
if (isStringNumeric(splitted[1])) {
|
||||
CamZoomOffsetX_value = std::stof(splitted[1]);
|
||||
}
|
||||
CamZoom_found = true;
|
||||
}
|
||||
else if ((isInString(configLines[i], "ZoomOffsetY")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetX"))) {
|
||||
CamZoomOffsetY_lines = i;
|
||||
if (isStringNumeric(splitted[1])) {
|
||||
CamZoomOffsetY_value = std::stof(splitted[1]);
|
||||
}
|
||||
CamZoom_found = true;
|
||||
}
|
||||
else {
|
||||
migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation");
|
||||
migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention");
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";Demo", "Demo"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";Demo", "Demo"); // Enable it
|
||||
|
||||
// Parameter is no longer used
|
||||
// migrated = migrated | replaceString(configLines[i], ";FixedExposure = true", ";FixedExposure = false"); // Set it to its default value
|
||||
// migrated = migrated | replaceString(configLines[i], ";FixedExposure", "FixedExposure"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], "ImageQuality", "CamQuality");
|
||||
migrated = migrated | replaceString(configLines[i], "AutoExposureLevel", "CamAeLevel");
|
||||
migrated = migrated | replaceString(configLines[i], "FixedExposure", "CamAec");
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], "ImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
migrated = migrated | replaceString(configLines[i], "Grayscale", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
migrated = migrated | replaceString(configLines[i], "Negative", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
}
|
||||
}
|
||||
|
||||
if (section == "[Alignment]") {
|
||||
// Parameter is no longer used
|
||||
// migrated = migrated | replaceString(configLines[i], ";InitialMirror = true", ";InitialMirror = false"); // Set it to its default value
|
||||
// migrated = migrated | replaceString(configLines[i], ";InitialMirror", "InitialMirror"); // Enable it
|
||||
|
||||
// Parameter is no longer used
|
||||
// migrated = migrated | replaceString(configLines[i], ";FlipImageSize = true", ";FlipImageSize = false"); // Set it to its default value
|
||||
// migrated = migrated | replaceString(configLines[i], ";FlipImageSize", "FlipImageSize"); // Enable it
|
||||
else if (section == "[Alignment]") {
|
||||
migrated = migrated | replaceString(configLines[i], "InitialMirror", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
migrated = migrated | replaceString(configLines[i], ";InitialMirror", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
migrated = migrated | replaceString(configLines[i], "FlipImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
migrated = migrated | replaceString(configLines[i], ";FlipImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
}
|
||||
|
||||
if (section == "[Digits]") {
|
||||
else if (section == "[Digits]") {
|
||||
migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation");
|
||||
migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention");
|
||||
}
|
||||
|
||||
if (section == "[Analog]") {
|
||||
else if (section == "[Analog]") {
|
||||
migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation");
|
||||
migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention");
|
||||
migrated = migrated | replaceString(configLines[i], "ExtendedResolution", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
}
|
||||
|
||||
if (section == "[PostProcessing]") {
|
||||
migrated = migrated | replaceString(configLines[i], "AnalogDigitalTransitionStart", "AnalogToDigitTransitionStart"); // Rename it
|
||||
migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse"); // Enable it
|
||||
|
||||
else if (section == "[PostProcessing]") {
|
||||
/* AllowNegativeRates has a <NUMBER> as prefix! */
|
||||
if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) { // It is the parameter "AllowNegativeRates" and it is commented out
|
||||
if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) {
|
||||
// It is the parameter "AllowNegativeRates" and it is commented out
|
||||
migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
}
|
||||
|
||||
/* IgnoreLeadingNaN has a <NUMBER> as prefix! */
|
||||
if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) { // It is the parameter "IgnoreLeadingNaN" and it is commented out
|
||||
else if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) {
|
||||
// It is the parameter "IgnoreLeadingNaN" and it is commented out
|
||||
migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
}
|
||||
|
||||
/* ExtendedResolution has a <NUMBER> as prefix! */
|
||||
if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) { // It is the parameter "ExtendedResolution" and it is commented out
|
||||
else if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) {
|
||||
// It is the parameter "ExtendedResolution" and it is commented out
|
||||
migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
|
||||
}
|
||||
else {
|
||||
migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse"); // Enable it
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage"); // Enable it
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency"); // Enable it
|
||||
}
|
||||
}
|
||||
|
||||
if (section == "[MQTT]") {
|
||||
migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages"); // First rename it, enable it with its default value
|
||||
else if (section == "[MQTT]") {
|
||||
migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages"); // First rename it, enable it with its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";RetainMessages = true", ";RetainMessages = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages"); // Enable it
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery = true", ";HomeassistantDiscovery = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery"); // Enable it
|
||||
|
||||
if (configLines[i].rfind("Topic", 0) != std::string::npos) // only if string starts with "Topic" (Was the naming in very old version)
|
||||
{
|
||||
// only if string starts with "Topic" (Was the naming in very old version)
|
||||
if (configLines[i].rfind("Topic", 0) != std::string::npos) {
|
||||
migrated = migrated | replaceString(configLines[i], "Topic", "MainTopic");
|
||||
}
|
||||
}
|
||||
|
||||
if (section == "[InfluxDB]") {
|
||||
else if (section == "[InfluxDB]") {
|
||||
/* Fieldname has a <NUMBER> as prefix! */
|
||||
if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
|
||||
if (isInString(configLines[i], "Fieldname")) {
|
||||
// It is the parameter "Fieldname"
|
||||
migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
|
||||
}
|
||||
}
|
||||
|
||||
if (section == "[InfluxDBv2]") {
|
||||
else if (section == "[InfluxDBv2]") {
|
||||
/* Fieldname has a <NUMBER> as prefix! */
|
||||
if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
|
||||
if (isInString(configLines[i], "Fieldname")) {
|
||||
// It is the parameter "Fieldname"
|
||||
migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
|
||||
}
|
||||
/* Database got renamed to Bucket! */
|
||||
if (isInString(configLines[i], "Database")) { // It is the parameter "Database"
|
||||
else if (isInString(configLines[i], "Database")) {
|
||||
// It is the parameter "Database"
|
||||
migrated = migrated | replaceString(configLines[i], "Database", "Bucket"); // Rename it to Bucket
|
||||
}
|
||||
}
|
||||
|
||||
if (section == "[GPIO]") {
|
||||
|
||||
else if (section == "[GPIO]") {
|
||||
}
|
||||
|
||||
if (section == "[DataLogging]") {
|
||||
else if (section == "[DataLogging]") {
|
||||
migrated = migrated | replaceString(configLines[i], "DataLogRetentionInDays", "DataFilesRetention");
|
||||
/* DataLogActive is true by default! */
|
||||
migrated = migrated | replaceString(configLines[i], ";DataLogActive = false", ";DataLogActive = true"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive"); // Enable it
|
||||
}
|
||||
|
||||
if (section == "[AutoTimer]") {
|
||||
else if (section == "[AutoTimer]") {
|
||||
migrated = migrated | replaceString(configLines[i], "Intervall", "Interval");
|
||||
migrated = migrated | replaceString(configLines[i], ";AutoStart = true", ";AutoStart = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart"); // Enable it
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart"); // Enable it
|
||||
}
|
||||
|
||||
if (section == "[Debug]") {
|
||||
else if (section == "[Debug]") {
|
||||
migrated = migrated | replaceString(configLines[i], "Logfile ", "LogLevel "); // Whitespace needed so it does not match `LogfileRetentionInDays`
|
||||
/* LogLevel (resp. LogFile) was originally a boolean, but we switched it to an int
|
||||
* For both cases (true/false), we set it to level 2 (WARNING) */
|
||||
@@ -689,27 +738,102 @@ void migrateConfiguration(void) {
|
||||
migrated = migrated | replaceString(configLines[i], "LogLevel = false", "LogLevel = 2");
|
||||
migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "LogfilesRetention");
|
||||
}
|
||||
|
||||
if (section == "[System]") {
|
||||
else if (section == "[System]") {
|
||||
migrated = migrated | replaceString(configLines[i], "RSSIThreashold", "RSSIThreshold");
|
||||
migrated = migrated | replaceString(configLines[i], "AutoAdjustSummertime", ";UNUSED_PARAMETER"); // This parameter is no longer used
|
||||
|
||||
migrated = migrated | replaceString(configLines[i], ";SetupMode = true", ";SetupMode = false"); // Set it to its default value
|
||||
migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode"); // Enable it
|
||||
migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode"); // Enable it
|
||||
}
|
||||
}
|
||||
|
||||
if (migrated) { // At least one replacement happened
|
||||
if (! RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) {
|
||||
if (CamZoom_found == true) {
|
||||
if (CamZoomSize_value == 0) {
|
||||
// mode0
|
||||
// 1600 - 640 = 960 / 2 = max-Offset (+/-) 480
|
||||
// 1200 - 480 = 720 / 2 = max-Offset (+/-) 360
|
||||
|
||||
if (CamZoomOffsetX_value > 960) {
|
||||
CamZoomOffsetX_value = 960;
|
||||
}
|
||||
else {
|
||||
CamZoomOffsetX_value = (floor((CamZoomOffsetX_value - 480) / 8) * 8);
|
||||
}
|
||||
|
||||
if (CamZoomOffsetY_value > 720) {
|
||||
CamZoomOffsetY_value = 720;
|
||||
}
|
||||
else {
|
||||
CamZoomOffsetY_value = (floor((CamZoomOffsetY_value - 360) / 8) * 8);
|
||||
}
|
||||
|
||||
CamZoomSize_value = 29;
|
||||
}
|
||||
else {
|
||||
// mode1
|
||||
// 800 - 640 = 160 / 2 = max-Offset (+/-) 80
|
||||
// 600 - 480 = 120 / 2 = max-Offset (+/-) 60
|
||||
|
||||
if (CamZoomOffsetX_value > 160) {
|
||||
CamZoomOffsetX_value = 160;
|
||||
}
|
||||
else {
|
||||
CamZoomOffsetX_value = (floor(((CamZoomOffsetX_value - 80) * 2) / 8) * 8);
|
||||
}
|
||||
|
||||
if (CamZoomOffsetY_value > 120) {
|
||||
CamZoomOffsetY_value = 120;
|
||||
}
|
||||
else {
|
||||
CamZoomOffsetY_value = (floor(((CamZoomOffsetY_value - 60) * 2) / 8) * 8);
|
||||
}
|
||||
|
||||
CamZoomSize_value = 9;
|
||||
}
|
||||
|
||||
if (CamZoom_lines > 0) {
|
||||
if (CamZoom_value) {
|
||||
configLines[CamZoom_lines] = ("CamZoom = true");
|
||||
}
|
||||
else {
|
||||
configLines[CamZoom_lines] = ("CamZoom = false");
|
||||
}
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'Zoom' to 'CamZoom'");
|
||||
migrated = true;
|
||||
}
|
||||
if (CamZoomSize_lines > 0) {
|
||||
configLines[CamZoomSize_lines] = ("CamZoomSize = " + std::to_string(CamZoomSize_value));
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomMode' to 'CamZoomSize'");
|
||||
migrated = true;
|
||||
}
|
||||
if (CamZoomOffsetX_lines > 0) {
|
||||
configLines[CamZoomOffsetX_lines] = ("CamZoomOffsetX = " + std::to_string(CamZoomOffsetX_value));
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetX' to 'CamZoomOffsetX'");
|
||||
migrated = true;
|
||||
}
|
||||
if (CamZoomOffsetY_lines > 0) {
|
||||
configLines[CamZoomOffsetY_lines] = ("CamZoomOffsetY = " + std::to_string(CamZoomOffsetY_value));
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetY' to 'CamZoomOffsetY'");
|
||||
migrated = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (migrated) {
|
||||
// At least one replacement happened
|
||||
if (!RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) {
|
||||
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to create backup of Config file!");
|
||||
return;
|
||||
}
|
||||
|
||||
FILE* pfile = fopen(CONFIG_FILE, "w");
|
||||
FILE *pfile = fopen(CONFIG_FILE, "w");
|
||||
|
||||
for (int i = 0; i < configLines.size(); i++) {
|
||||
fwrite(configLines[i].c_str() , configLines[i].length(), 1, pfile);
|
||||
fwrite("\n" , 1, 1, pfile);
|
||||
if (!isInString(configLines[i], ";UNUSED_PARAMETER")) {
|
||||
fwrite(configLines[i].c_str(), configLines[i].length(), 1, pfile);
|
||||
fwrite("\n", 1, 1, pfile);
|
||||
}
|
||||
}
|
||||
|
||||
fclose(pfile);
|
||||
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Config file migrated. Saved backup to " + string(CONFIG_FILE_BACKUP));
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Parameter `<NUMBER>.AnalogDigitTransitionStart`
|
||||
# Parameter `<NUMBER>.AnalogToDigitTransitionStart`
|
||||
Default Value: `9.2`
|
||||
|
||||
This can be used if you have wrong values, but the recognition of the individual ROIs are correct.
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
range on OV3660 and OV5640 (0 .. 8)
|
||||
|
||||
Default Value: `true`
|
||||
Default Value: `0`
|
||||
|
||||
See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
|
||||
See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
|
||||
|
||||
@@ -36,11 +36,9 @@ Demo = false
|
||||
|
||||
[Alignment]
|
||||
InitialRotate = 0.0
|
||||
InitialMirror = false
|
||||
SearchFieldX = 20
|
||||
SearchFieldY = 20
|
||||
AlignmentAlgo = Default
|
||||
FlipImageSize = false
|
||||
/config/ref0.jpg 103 271
|
||||
/config/ref1.jpg 442 142
|
||||
|
||||
@@ -103,7 +101,7 @@ HomeassistantDiscovery = false
|
||||
;Measurement = undefined
|
||||
;Org = undefined
|
||||
;Token = undefined
|
||||
;main.Fieldname = undefined
|
||||
;main.Field = undefined
|
||||
|
||||
;[Webhook]
|
||||
;Uri = undefined
|
||||
|
||||
@@ -363,8 +363,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAutoSharpness_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAutoSharpness</td>
|
||||
@@ -421,8 +421,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAwb_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAwb</td>
|
||||
@@ -434,8 +434,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAwbGain_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAwbGain</td>
|
||||
@@ -447,8 +447,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAec_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAec</td>
|
||||
@@ -460,8 +460,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAec2_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAec2</td>
|
||||
@@ -495,8 +495,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAgc_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAgc</td>
|
||||
@@ -520,8 +520,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamBpc_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamBpc</td>
|
||||
@@ -533,8 +533,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamWpc_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamWpc</td>
|
||||
@@ -546,8 +546,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamRawGma_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamRawGma</td>
|
||||
@@ -559,8 +559,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamLenc_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamLenc</td>
|
||||
@@ -572,8 +572,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamHmirror_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamHmirror</td>
|
||||
@@ -585,8 +585,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamVflip_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamVflip</td>
|
||||
@@ -598,8 +598,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamDcw_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamDcw</td>
|
||||
@@ -622,8 +622,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamZoom_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamZoom</td>
|
||||
@@ -681,8 +681,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_Demo_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_Demo</td>
|
||||
@@ -850,8 +850,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_PreValueUse_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_PreValueUse</td>
|
||||
@@ -875,8 +875,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_ErrorMessage_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_ErrorMessage</td>
|
||||
@@ -888,8 +888,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_CheckDigitIncreaseConsistency_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_CheckDigitIncreaseConsistency</td>
|
||||
@@ -910,8 +910,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_AllowNegativeRates_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_NUMBER.AllowNegativeRates</td>
|
||||
@@ -933,11 +933,11 @@
|
||||
<tr>
|
||||
<td class="indent2">
|
||||
<input type="checkbox" id="PostProcessing_AnalogToDigitTransitionStart_enabled" value="1" onclick = 'InvertEnableItem("PostProcessing", "AnalogToDigitTransitionStart")' unchecked >
|
||||
<label for=PostProcessing_AnalogToDigitTransitionStart_enabled><class id="PostProcessing_AnalogToDigitTransitionStart_text" style="color:black;">Analog/Digital Transition Start</class></label>
|
||||
<label for=PostProcessing_AnalogToDigitTransitionStart_enabled><class id="PostProcessing_AnalogToDigitTransitionStart_text" style="color:black;">Analog to Digit Transition Start</class></label>
|
||||
</td>
|
||||
<td>
|
||||
<input required type="number" id="PostProcessing_AnalogToDigitTransitionStart_value1" step="0.1" min="5.0" max="9.9" value="9.2"
|
||||
oninput="(!validity.rangeUnderflow||(value=5.0)) && (!validity.rangeOverflow||(value=9.9)) &&
|
||||
<input required type="number" id="PostProcessing_AnalogToDigitTransitionStart_value1" step="0.1" min="3.0" max="9.9" value="9.2"
|
||||
oninput="(!validity.rangeUnderflow||(value=3.0)) && (!validity.rangeOverflow||(value=9.9)) &&
|
||||
(!validity.stepMismatch||(value=parseInt(this.value)));">
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_NUMBER.AnalogToDigitTransitionStart</td>
|
||||
@@ -988,8 +988,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_ExtendedResolution_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_NUMBER.ExtendedResolution</td>
|
||||
@@ -1001,8 +1001,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_IgnoreLeadingNaN_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_NUMBER.IgnoreLeadingNaN</td>
|
||||
@@ -1014,8 +1014,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="PostProcessing_IgnoreAllNaN_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_PostProcessing_NUMBER.IgnoreAllNaN</td>
|
||||
@@ -1126,8 +1126,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="MQTT_RetainMessages_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_MQTT_RetainMessages</td>
|
||||
@@ -1148,8 +1148,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="MQTT_HomeassistantDiscovery_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_MQTT_HomeassistantDiscovery</td>
|
||||
@@ -1900,8 +1900,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="AutoTimer_AutoStart_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_AutoTimer_AutoStart</td>
|
||||
@@ -1930,8 +1930,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="DataLogging_DataLogActive_value1">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_DataLogging_DataLogActive</td>
|
||||
@@ -2053,8 +2053,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="System_Tooltip_value1" onchange="UpdateTooltipModus()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td></td>
|
||||
@@ -2323,7 +2323,7 @@ function UpdateInput() {
|
||||
|
||||
WriteParameter(param, category, "Webhook", "Uri", true);
|
||||
WriteParameter(param, category, "Webhook", "ApiKey", true);
|
||||
WriteParameter(param, category, "Webhook", "UploadImg", true);
|
||||
WriteParameter(param, category, "Webhook", "UploadImg", false);
|
||||
|
||||
WriteParameter(param, category, "GPIO", "IO0", true);
|
||||
WriteParameter(param, category, "GPIO", "IO1", true);
|
||||
@@ -2374,12 +2374,12 @@ function WriteModelFiles() {
|
||||
|
||||
var text = list_tflite[i].replace("/config/", "");
|
||||
|
||||
if (list_tflite[i].includes("/dig")) { // Its a digital file, only show in the digital list box
|
||||
if (list_tflite[i].includes("/dig")) { // Its a digit file, only show in the digits list box
|
||||
optionDig.text = text;
|
||||
optionDig.value = list_tflite[i];
|
||||
_indexDig.add(optionDig);
|
||||
}
|
||||
else if (list_tflite[i].includes("/ana")) { // Its a digital file, only show in the analog list box
|
||||
else if (list_tflite[i].includes("/ana")) { // Its a digit file, only show in the analog list box
|
||||
optionAna.text = text;
|
||||
optionAna.value = list_tflite[i];
|
||||
_indexAna.add(optionAna);
|
||||
@@ -2489,7 +2489,7 @@ function ReadParameterAll() {
|
||||
|
||||
ReadParameter(param, "Webhook", "Uri", true);
|
||||
ReadParameter(param, "Webhook", "ApiKey", true);
|
||||
ReadParameter(param, "Webhook", "UploadImg", true);
|
||||
ReadParameter(param, "Webhook", "UploadImg", false);
|
||||
|
||||
ReadParameter(param, "GPIO", "IO0", true);
|
||||
ReadParameter(param, "GPIO", "IO1", true);
|
||||
|
||||
@@ -51,9 +51,12 @@ p {font-size: 1em;}
|
||||
if (!loadConfig(domainname)) {
|
||||
firework.launch('Setup mode could not be deactivated! Please try again!', 'danger', 30000);
|
||||
return;
|
||||
}
|
||||
ParseConfig();
|
||||
param = getConfigParameters();
|
||||
}
|
||||
|
||||
// ParseConfig();
|
||||
// param = getConfigParameters();
|
||||
param = getCamConfig();
|
||||
|
||||
param["System"]["SetupMode"]["enabled"] = true;
|
||||
param["System"]["SetupMode"]["value1"] = "false";
|
||||
|
||||
|
||||
@@ -174,8 +174,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamZoom_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamZoom</td>
|
||||
@@ -232,8 +232,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAec2_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAec2</td>
|
||||
@@ -245,8 +245,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamHmirror_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamHmirror</td>
|
||||
@@ -267,8 +267,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamVflip_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamVflip</td>
|
||||
@@ -332,8 +332,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAec_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAec</td>
|
||||
@@ -355,8 +355,8 @@
|
||||
</td>
|
||||
<td>
|
||||
<select id="TakeImage_CamAutoSharpness_value1" onchange="cameraParameterChanged()">
|
||||
<option value="true">enable</option>
|
||||
<option value="false" selected>disable</option>
|
||||
<option value="true">enable (true)</option>
|
||||
<option value="false" selected>disable (false)</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$TOOLTIP_TakeImage_CamAutoSharpness</td>
|
||||
|
||||
Reference in New Issue
Block a user