Skip to content

Commit 655f9d7

Browse files
committed
Update version
1 parent 03b5e36 commit 655f9d7

File tree

10 files changed

+11
-30
lines changed

10 files changed

+11
-30
lines changed

code/components/jomjol_flowcontroll/ClassFlowAnalog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ bool ClassFlowAnalog::ReadParameter(FILE* pfile, string& aktparamgraph)
190190

191191
analog* ClassFlowAnalog::FindANALOG(string _name_number)
192192
{
193-
analog *_ret = NULL;
194193

195194
for (int i = 0; i < ANALOG.size(); ++i)
196195
{

code/components/jomjol_flowcontroll/ClassFlowDigit.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ bool ClassFlowDigit::ReadParameter(FILE* pfile, string& aktparamgraph)
161161

162162
digit* ClassFlowDigit::FindDIGIT(string _name_number)
163163
{
164-
digit *_ret = NULL;
165-
166164
for (int i = 0; i < DIGIT.size(); ++i)
167165
{
168166
if (DIGIT[i]->name == _name_number)

code/components/jomjol_image_proc/CImageBasis.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,10 @@ CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat)
354354
int memsize = width * height * channels;
355355
rgb_image = (unsigned char*)GET_MEMORY(memsize);
356356

357-
TickType_t xDelay;
358357
int anz = 1;
359358
while (!rgb_image && (anz < _anzrepeat))
360359
{
361-
printf("Create Image from Copy - Speicher ist voll - Versuche es erneut: %d.\n", anz);
362-
xDelay = 1000 / portTICK_PERIOD_MS;
360+
printf("Create Image from Copy - Speicher ist voll - Versuche es erneut: %d.\n", anz);
363361
rgb_image = (unsigned char*) malloc(memsize);
364362
anz++;
365363
}

code/components/jomjol_tfliteclass/CTfLiteClass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ void CTfLiteClass::MakeAllocate()
156156
}
157157

158158
void CTfLiteClass::GetInputTensorSize(){
159+
#ifdef DEBUG_DETAIL_ON
159160
float *zw = this->input;
160161
int test = sizeof(zw);
161-
#ifdef DEBUG_DETAIL_ON
162162
printf("Input Tensor Dimension: %d\n", test);
163163
#endif
164164
}
@@ -185,13 +185,11 @@ unsigned char* CTfLiteClass::ReadFileToCharArray(std::string _fn)
185185

186186
unsigned char *result = (unsigned char*) malloc(size);
187187
int anz = 1;
188-
TickType_t xDelay;
189188
while (!result && (anz < 6)) // maximal 5x versuchen (= 5s)
190189
{
191190
#ifdef DEBUG_DETAIL_ON
192191
printf("Speicher ist voll - Versuche es erneut: %d.\n", anz);
193192
#endif
194-
xDelay = 1000 / portTICK_PERIOD_MS;
195193
result = (unsigned char*) malloc(size);
196194
anz++;
197195
}

code/main/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="1f6b02a";
1+
const char* GIT_REV="03b5e36";
22
const char* GIT_TAG="";
3-
const char* GIT_BRANCH="rolling";
4-
const char* BUILD_TIME="2021-07-13 20:37";
3+
const char* GIT_BRANCH="master";
4+
const char* BUILD_TIME="2021-07-14 19:54";

code/main/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C"
1313
#include "Helper.h"
1414
#include <fstream>
1515

16-
const char* GIT_BASE_BRANCH = "master - v7.1.2 - 2020-06-17";
16+
const char* GIT_BASE_BRANCH = "master - v8.0.0 - 2021-07-14";
1717

1818

1919
const char* git_base_branch(void)

code/sdkconfig

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
166166
#
167167
# CONFIG_BT_ENABLED is not set
168168
CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
169-
CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
170-
CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
171169
CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
172170
CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
173171
CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -242,7 +240,6 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
242240
#
243241
# ESP32-specific
244242
#
245-
CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
246243
CONFIG_ESP32_REV_MIN_0=y
247244
# CONFIG_ESP32_REV_MIN_1 is not set
248245
# CONFIG_ESP32_REV_MIN_2 is not set
@@ -660,10 +657,8 @@ CONFIG_LWIP_SO_REUSE=y
660657
CONFIG_LWIP_SO_REUSE_RXTOALL=y
661658
# CONFIG_LWIP_SO_RCVBUF is not set
662659
# CONFIG_LWIP_NETBUF_RECVINFO is not set
663-
CONFIG_LWIP_IP4_FRAG=y
664-
CONFIG_LWIP_IP6_FRAG=y
665-
# CONFIG_LWIP_IP4_REASSEMBLY is not set
666-
# CONFIG_LWIP_IP6_REASSEMBLY is not set
660+
CONFIG_LWIP_IP_FRAG=y
661+
# CONFIG_LWIP_IP_REASSEMBLY is not set
667662
# CONFIG_LWIP_STATS is not set
668663
# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
669664
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
@@ -687,10 +682,8 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
687682
#
688683
# TCP
689684
#
690-
CONFIG_LWIP_TCP_ISN_HOOK=y
691685
CONFIG_LWIP_MAX_ACTIVE_TCP=16
692686
CONFIG_LWIP_MAX_LISTENING_TCP=16
693-
CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
694687
CONFIG_LWIP_TCP_MAXRTX=12
695688
CONFIG_LWIP_TCP_SYNMAXRTX=6
696689
CONFIG_LWIP_TCP_MSS=1440
@@ -705,7 +698,6 @@ CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
705698
CONFIG_LWIP_TCP_OVERSIZE_MSS=y
706699
# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
707700
# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
708-
CONFIG_LWIP_TCP_RTO_TIME=1500
709701
# end of TCP
710702

711703
#
@@ -721,8 +713,6 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
721713
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
722714
CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
723715
# CONFIG_LWIP_PPP_SUPPORT is not set
724-
CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
725-
CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
726716

727717
#
728718
# ICMP
@@ -1006,8 +996,6 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
1006996
#
1007997
CONFIG_WPA_MBEDTLS_CRYPTO=y
1008998
# CONFIG_WPA_TLS_V12 is not set
1009-
# CONFIG_WPA_WPS_WARS is not set
1010-
# CONFIG_WPA_DEBUG_PRINT is not set
1011999
# end of Supplicant
10121000

10131001
#

code/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="1f6b02a";
1+
const char* GIT_REV="03b5e36";
22
const char* GIT_TAG="";
3-
const char* GIT_BRANCH="rolling";
4-
const char* BUILD_TIME="2021-07-13 20:37";
3+
const char* GIT_BRANCH="master";
4+
const char* BUILD_TIME="2021-07-14 19:53";

firmware/bootloader.bin

0 Bytes
Binary file not shown.

firmware/firmware.bin

-208 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)