Parcourir la source

Rolling 20220930

jomjol il y a 3 ans
Parent
commit
6b329aaa58

+ 1 - 1
Changelog.md

@@ -15,7 +15,7 @@
 ### Fixed
 ### Fixed
 
 
 -   [#1116](https://github.com/jomjol/AI-on-the-edge-device/issues/1116) precision problem at setting prevalue
 -   [#1116](https://github.com/jomjol/AI-on-the-edge-device/issues/1116) precision problem at setting prevalue
-
+-   [#1119](https://github.com/jomjol/AI-on-the-edge-device/issues/1119) renamed `firmware.bin` not working in OTA
 ### Removed
 ### Removed
 
 
 -   n.a.
 -   n.a.

+ 1 - 1
code/components/jomjol_fileserver_ota/server_file.cpp

@@ -769,7 +769,7 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st
                 zw = std::string(archive_filename);
                 zw = std::string(archive_filename);
                 printf("Rohfilename: %s\n", zw.c_str());
                 printf("Rohfilename: %s\n", zw.c_str());
 
 
-                if (toUpper(zw) == "FIRMWARE.BIN")
+                if (getFileType(zw) == "BIN")
                 {
                 {
                     zw = _target_bin + zw;
                     zw = _target_bin + zw;
                     ret = zw;
                     ret = zw;

+ 1 - 1
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -78,7 +78,7 @@ void ClassFlowPostProcessing::SetPreValue(double zw, string _numbers, bool _exte
         if (NUMBERS[j]->name == _numbers)
         if (NUMBERS[j]->name == _numbers)
         {
         {
             NUMBERS[j]->PreValue = zw;
             NUMBERS[j]->PreValue = zw;
-            NUMBERS[j]->ReturnPreValue = std::to_string(zw);
+            NUMBERS[j]->ReturnPreValue = RundeOutput(zw, NUMBERS[j]->Nachkomma);
             NUMBERS[j]->PreValueOkay = true;
             NUMBERS[j]->PreValueOkay = true;
             if (_extern)
             if (_extern)
             {
             {