diff --git a/README.md b/README.md index 09fde361..93b4fbd0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 -##### Rolling - (2020-10-18) +##### Rolling - (2020-10-24) + +* Bug-Fixing in case of automated restart + +2020-10-18 * New implementation of "checkDigitConsistency" now also for digits diff --git a/code/lib/jomjol_controlcamera/ClassControllCamera.cpp b/code/lib/jomjol_controlcamera/ClassControllCamera.cpp index e8f5b781..bea60d38 100644 --- a/code/lib/jomjol_controlcamera/ClassControllCamera.cpp +++ b/code/lib/jomjol_controlcamera/ClassControllCamera.cpp @@ -10,6 +10,8 @@ #include "camera_define.h" +#include "driver/ledc.h" + CCamera Camera; @@ -20,6 +22,42 @@ typedef struct { size_t len; } jpg_chunking_t; + + +/////////////////////////////////////////////////////////////////////////////////////////////////////// +#define LEDC_LS_CH2_GPIO (4) +#define LEDC_LS_CH2_CHANNEL LEDC_CHANNEL_2 +#define LEDC_LS_TIMER LEDC_TIMER_1 +#define LEDC_LS_MODE LEDC_LOW_SPEED_MODE +#define LEDC_TEST_DUTY (4000) + +void test(){ + ledc_channel_config_t ledc_channel = { }; + + ledc_channel.channel = LEDC_LS_CH2_CHANNEL; + ledc_channel.duty = 0; + ledc_channel.gpio_num = FLASH_GPIO; + ledc_channel.speed_mode = LEDC_LS_MODE; + ledc_channel.hpoint = 0; + ledc_channel.timer_sel = LEDC_LS_TIMER; + + ledc_channel_config(&ledc_channel); + + ledc_set_duty(ledc_channel.speed_mode, ledc_channel.channel, LEDC_TEST_DUTY); + ledc_update_duty(ledc_channel.speed_mode, ledc_channel.channel); + vTaskDelay(1000 / portTICK_PERIOD_MS); +}; + + + + +//////////////////////////////////////////////////////////////////////////////////////////////////////// + + + + + + static size_t jpg_encode_stream(void * arg, size_t index, const void* data, size_t len){ jpg_chunking_t *j = (jpg_chunking_t *)arg; if(!index){ diff --git a/code/lib/jomjol_fileserver_ota/server_ota.cpp b/code/lib/jomjol_fileserver_ota/server_ota.cpp index 11359885..773b51d6 100644 --- a/code/lib/jomjol_fileserver_ota/server_ota.cpp +++ b/code/lib/jomjol_fileserver_ota/server_ota.cpp @@ -402,8 +402,8 @@ void task_reboot(void *pvParameter) void doReboot(){ LogFile.WriteToFile("Reboot - now"); - KillTFliteTasks(); xTaskCreate(&task_reboot, "reboot", configMINIMAL_STACK_SIZE * 64, NULL, 10, NULL); + KillTFliteTasks(); } diff --git a/code/src/version.cpp b/code/src/version.cpp index c7910920..c1660e4a 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="7e57e85"; +const char* GIT_REV="0d90977"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-10-18 09:07"; \ No newline at end of file +const char* BUILD_TIME="2020-10-24 11:45"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index c7910920..c1660e4a 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="7e57e85"; +const char* GIT_REV="0d90977"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-10-18 09:07"; \ No newline at end of file +const char* BUILD_TIME="2020-10-24 11:45"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 869ec096..32739941 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 887c1d07..e80f487a 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ