Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-06 19:46:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rolling 20220925

Browse Source
This commit is contained in:
jomjol
2022-09-25 19:39:10 +02:00
parent 8275bdbc25
commit d11ee2a4cf
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,6 +4,7 @@
.code-workspace .code-workspace
/sd-card/htm./.vscode/ /sd-card/htm./.vscode/
/code/build /code/build
/code/.helper
/sd-card/html/debug/ /sd-card/html/debug/
/firmware/ /firmware/
version.txt version.txt

4
code/components/jomjol_fileserver_ota/server_file.cpp
View File

@@ -719,12 +719,14 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st
void* p; void* p;
char archive_filename[64]; char archive_filename[64];
std::string zw, ret = ""; std::string zw, ret = "";
std::string directory = "";
// static const char* s_Test_archive_filename = "testhtml.zip"; // static const char* s_Test_archive_filename = "testhtml.zip";
printf("miniz.c version: %s\n", MZ_VERSION); printf("miniz.c version: %s\n", MZ_VERSION);
printf("Zipfile: %s\n", _in_zip_file.c_str()); printf("Zipfile: %s\n", _in_zip_file.c_str());
printf("Target Dir ZIP: %s\n", _target_zip.c_str()); printf("Target Dir ZIP: %s\n", _target_zip.c_str());
printf("Target Dir BIN: %s\n", _target_bin.c_str()); printf("Target Dir BIN: %s\n", _target_bin.c_str());
printf("Target Dir main: %s\n", _main.c_str());
// Now try to open the archive. // Now try to open the archive.
memset(&zip_archive, 0, sizeof(zip_archive)); memset(&zip_archive, 0, sizeof(zip_archive));
@@ -765,6 +767,8 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st
// Save to File. // Save to File.
zw = std::string(archive_filename); zw = std::string(archive_filename);
printf("Rohfilename: %s\n", zw.c_str());
if (toUpper(zw) == "FIRMWARE.BIN") if (toUpper(zw) == "FIRMWARE.BIN")
{ {
zw = _target_bin + zw; zw = _target_bin + zw;

3
code/components/jomjol_helper/Helper.cpp
View File

@@ -305,6 +305,9 @@ string getDirectory(string filename)
{ {
size_t lastpos = filename.find('/'); size_t lastpos = filename.find('/');
if (lastpos == string::npos)
lastpos = filename.find('\\');
if (lastpos == string::npos) if (lastpos == string::npos)
return ""; return "";