Skip to content

Commit

Permalink
Merge pull request #68 from jomjol/rolling
Browse files Browse the repository at this point in the history
Update to v4.1.1
  • Loading branch information
jomjol authored Dec 2, 2020
2 parents 8f5200e + c9c02da commit ffc15aa
Show file tree
Hide file tree
Showing 11 changed files with 1,197 additions and 31 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571

**General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!

##### 4.1.1 Configuration editor - (2020-12-02)

* Bug fixing: internal improvement of file handling (reduce not responding)

##### 4.1.0 Configuration editor- (2020-11-30)


##### 4.1.0 Configuration editor - (2020-11-30)

* Implementation of configuration editor (including basic and expert mode)

Expand Down
3 changes: 1 addition & 2 deletions code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ bool ClassFlowMQTT::doFlow(string zwtime)
}

OldValue = result;



return true;
}
21 changes: 11 additions & 10 deletions code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "ClassFlowAnalog.h"
#include "ClassFlowDigit.h"
#include "ClassFlowMakeImage.h"
#include "ClassLogFile.h"

#include <iomanip>
#include <sstream>
Expand Down Expand Up @@ -42,6 +43,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
zwtime = trim(std::string(zw));

fgets(zw, 1024, pFile);
fclose(pFile);
printf("%s", zw);
zwvalue = trim(std::string(zw));
PreValue = stof(zwvalue.c_str());
Expand Down Expand Up @@ -103,17 +105,15 @@ void ClassFlowPostProcessing::SavePreValue(float value, string zwtime)
timeinfo = localtime(&rawtime);

strftime(buffer, 80, "%Y-%m-%d_%H-%M-%S", timeinfo);

zwtime = std::string(buffer);
}

fputs(zwtime.c_str(), pFile);
fputs("\n", pFile);

fputs(to_string(value).c_str(), pFile);
fputs("\n", pFile);
fputs(zwtime.c_str(), pFile);
fputs("\n", pFile);
fputs(to_string(value).c_str(), pFile);
fputs("\n", pFile);

fclose(pFile);
fclose(pFile);
}


Expand Down Expand Up @@ -269,6 +269,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)

ErrorMessageText = "";


for (int i = 0; i < ListFlowControll->size(); ++i)
{
if (((*ListFlowControll)[i])->name().compare("ClassFlowMakeImage") == 0)
Expand Down Expand Up @@ -312,6 +313,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)

ReturnRawValue = ShiftDecimal(ReturnRawValue, DecimalShift);


if (!PreValueUse || !PreValueOkay)
{
ReturnValue = ReturnRawValue;
Expand All @@ -336,7 +338,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)

zw = ErsetzteN(ReturnRawValue);


Value = std::stof(zw);
if (checkDigitIncreaseConsistency)
{
Expand Down Expand Up @@ -367,10 +368,10 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
if (ErrorMessageText.length() == 0)
{
PreValue = Value;

SavePreValue(Value, zwtime);

}


return true;
}

Expand Down
13 changes: 2 additions & 11 deletions code/components/jomjol_time_sntp/time_sntp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,7 @@ std::string gettimestring(const char * frm)
time_t now;
struct tm timeinfo;
time(&now);
localtime_r(&now, &timeinfo);
// Is time set? If not, tm_year will be (1970 - 1900).
if (timeinfo.tm_year < (2016 - 1900)) {
ESP_LOGI(TAG, "Reboot - Connecting to WiFi and getting time over NTP.");
obtain_time();
// update 'now' variable with current time
time(&now);
}
char strftime_buf[64];

// setenv("TZ", "UTC-2", 1);
// tzset();
localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), frm, &timeinfo);

Expand Down Expand Up @@ -119,6 +108,8 @@ static void obtain_time(void)
struct tm timeinfo = {};
int retry = 0;
const int retry_count = 10;
time(&now);
localtime_r(&now, &timeinfo);
while (sntp_get_sync_status() == SNTP_SYNC_STATUS_RESET && ++retry < retry_count) {
ESP_LOGI(TAG, "Waiting for system time to be set... (%d/%d)", retry, retry_count);
vTaskDelay(2000 / portTICK_PERIOD_MS);
Expand Down
2 changes: 1 addition & 1 deletion code/sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ CONFIG_FATFS_MAX_LFN=255
CONFIG_FATFS_API_ENCODING_ANSI_OEM=y
# CONFIG_FATFS_API_ENCODING_UTF_16 is not set
# CONFIG_FATFS_API_ENCODING_UTF_8 is not set
CONFIG_FATFS_FS_LOCK=0
CONFIG_FATFS_FS_LOCK=5
CONFIG_FATFS_TIMEOUT_MS=10000
CONFIG_FATFS_PER_FILE_CACHE=y
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
Expand Down
Loading

0 comments on commit ffc15aa

Please sign in to comment.