mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 19:46:54 +03:00
* Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu> * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog --------- Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
270 lines
6.6 KiB
C
270 lines
6.6 KiB
C
// example3.c - Demonstrates how to use miniz.c's deflate() and inflate() functions for simple file compression.
|
|
// Public domain, May 15 2011, Rich Geldreich, richgel99@gmail.com. See "unlicense" statement at the end of tinfl.c.
|
|
// For simplicity, this example is limited to files smaller than 4GB, but this is not a limitation of miniz.c.
|
|
#include <stdio.h>
|
|
#include <limits.h>
|
|
#include "miniz.h"
|
|
|
|
typedef unsigned char uint8;
|
|
typedef unsigned short uint16;
|
|
typedef unsigned int uint;
|
|
|
|
#define my_max(a,b) (((a) > (b)) ? (a) : (b))
|
|
#define my_min(a,b) (((a) < (b)) ? (a) : (b))
|
|
|
|
#define BUF_SIZE (1024 * 1024)
|
|
static uint8 s_inbuf[BUF_SIZE];
|
|
static uint8 s_outbuf[BUF_SIZE];
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
const char *pMode;
|
|
FILE *pInfile, *pOutfile;
|
|
uint infile_size;
|
|
int level = Z_BEST_COMPRESSION;
|
|
z_stream stream;
|
|
int p = 1;
|
|
const char *pSrc_filename;
|
|
const char *pDst_filename;
|
|
long file_loc;
|
|
|
|
printf("miniz.c version: %s\n", MZ_VERSION);
|
|
|
|
if (argc < 4)
|
|
{
|
|
printf("Usage: example3 [options] [mode:c or d] infile outfile\n");
|
|
printf("\nModes:\n");
|
|
printf("c - Compresses file infile to a zlib stream in file outfile\n");
|
|
printf("d - Decompress zlib stream in file infile to file outfile\n");
|
|
printf("\nOptions:\n");
|
|
printf("-l[0-10] - Compression level, higher values are slower.\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
while ((p < argc) && (argv[p][0] == '-'))
|
|
{
|
|
switch (argv[p][1])
|
|
{
|
|
case 'l':
|
|
{
|
|
level = atoi(&argv[1][2]);
|
|
if ((level < 0) || (level > 10))
|
|
{
|
|
printf("Invalid level!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
{
|
|
printf("Invalid option: %s\n", argv[p]);
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
p++;
|
|
}
|
|
|
|
if ((argc - p) < 3)
|
|
{
|
|
printf("Must specify mode, input filename, and output filename after options!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
else if ((argc - p) > 3)
|
|
{
|
|
printf("Too many filenames!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
pMode = argv[p++];
|
|
if (!strchr("cCdD", pMode[0]))
|
|
{
|
|
printf("Invalid mode!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
pSrc_filename = argv[p++];
|
|
pDst_filename = argv[p++];
|
|
|
|
printf("Mode: %c, Level: %u\nInput File: \"%s\"\nOutput File: \"%s\"\n", pMode[0], level, pSrc_filename, pDst_filename);
|
|
|
|
// Open input file.
|
|
pInfile = fopen(pSrc_filename, "rb");
|
|
if (!pInfile)
|
|
{
|
|
printf("Failed opening input file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
// Determine input file's size.
|
|
fseek(pInfile, 0, SEEK_END);
|
|
file_loc = ftell(pInfile);
|
|
fseek(pInfile, 0, SEEK_SET);
|
|
|
|
if ((file_loc < 0) || ((mz_uint64)file_loc > INT_MAX))
|
|
{
|
|
// This is not a limitation of miniz or tinfl, but this example.
|
|
printf("File is too large to be processed by this example.\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
infile_size = (uint)file_loc;
|
|
|
|
// Open output file.
|
|
pOutfile = fopen(pDst_filename, "wb");
|
|
if (!pOutfile)
|
|
{
|
|
printf("Failed opening output file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
printf("Input file size: %u\n", infile_size);
|
|
|
|
// Init the z_stream
|
|
memset(&stream, 0, sizeof(stream));
|
|
stream.next_in = s_inbuf;
|
|
stream.avail_in = 0;
|
|
stream.next_out = s_outbuf;
|
|
stream.avail_out = BUF_SIZE;
|
|
|
|
if ((pMode[0] == 'c') || (pMode[0] == 'C'))
|
|
{
|
|
// Compression.
|
|
uint infile_remaining = infile_size;
|
|
|
|
if (deflateInit(&stream, level) != Z_OK)
|
|
{
|
|
printf("deflateInit() failed!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
for ( ; ; )
|
|
{
|
|
int status;
|
|
if (!stream.avail_in)
|
|
{
|
|
// Input buffer is empty, so read more bytes from input file.
|
|
uint n = my_min(BUF_SIZE, infile_remaining);
|
|
|
|
if (fread(s_inbuf, 1, n, pInfile) != n)
|
|
{
|
|
printf("Failed reading from input file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
stream.next_in = s_inbuf;
|
|
stream.avail_in = n;
|
|
|
|
infile_remaining -= n;
|
|
//printf("Input bytes remaining: %u\n", infile_remaining);
|
|
}
|
|
|
|
status = deflate(&stream, infile_remaining ? Z_NO_FLUSH : Z_FINISH);
|
|
|
|
if ((status == Z_STREAM_END) || (!stream.avail_out))
|
|
{
|
|
// Output buffer is full, or compression is done, so write buffer to output file.
|
|
uint n = BUF_SIZE - stream.avail_out;
|
|
if (fwrite(s_outbuf, 1, n, pOutfile) != n)
|
|
{
|
|
printf("Failed writing to output file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
stream.next_out = s_outbuf;
|
|
stream.avail_out = BUF_SIZE;
|
|
}
|
|
|
|
if (status == Z_STREAM_END)
|
|
break;
|
|
else if (status != Z_OK)
|
|
{
|
|
printf("deflate() failed with status %i!\n", status);
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
|
|
if (deflateEnd(&stream) != Z_OK)
|
|
{
|
|
printf("deflateEnd() failed!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
else if ((pMode[0] == 'd') || (pMode[0] == 'D'))
|
|
{
|
|
// Decompression.
|
|
uint infile_remaining = infile_size;
|
|
|
|
if (inflateInit(&stream))
|
|
{
|
|
printf("inflateInit() failed!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
for ( ; ; )
|
|
{
|
|
int status;
|
|
if (!stream.avail_in)
|
|
{
|
|
// Input buffer is empty, so read more bytes from input file.
|
|
uint n = my_min(BUF_SIZE, infile_remaining);
|
|
|
|
if (fread(s_inbuf, 1, n, pInfile) != n)
|
|
{
|
|
printf("Failed reading from input file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
stream.next_in = s_inbuf;
|
|
stream.avail_in = n;
|
|
|
|
infile_remaining -= n;
|
|
}
|
|
|
|
status = inflate(&stream, Z_SYNC_FLUSH);
|
|
|
|
if ((status == Z_STREAM_END) || (!stream.avail_out))
|
|
{
|
|
// Output buffer is full, or decompression is done, so write buffer to output file.
|
|
uint n = BUF_SIZE - stream.avail_out;
|
|
if (fwrite(s_outbuf, 1, n, pOutfile) != n)
|
|
{
|
|
printf("Failed writing to output file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
stream.next_out = s_outbuf;
|
|
stream.avail_out = BUF_SIZE;
|
|
}
|
|
|
|
if (status == Z_STREAM_END)
|
|
break;
|
|
else if (status != Z_OK)
|
|
{
|
|
printf("inflate() failed with status %i!\n", status);
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
|
|
if (inflateEnd(&stream) != Z_OK)
|
|
{
|
|
printf("inflateEnd() failed!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
printf("Invalid mode!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
fclose(pInfile);
|
|
if (EOF == fclose(pOutfile))
|
|
{
|
|
printf("Failed writing to output file!\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
printf("Total input bytes: %u\n", (mz_uint32)stream.total_in);
|
|
printf("Total output bytes: %u\n", (mz_uint32)stream.total_out);
|
|
printf("Success.\n");
|
|
return EXIT_SUCCESS;
|
|
}
|