From ff8251aabd7b2e4bb80e548dfbb260a4de7a6b29 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Mon, 20 Apr 2020 07:40:31 +0200 Subject: [PATCH] Fix wrong calculation of EEPROM positions and max all size homogenous Thanks @TheMaskedDeveloper for pointing this out --- esp3d/src/core/settings_esp3d.cpp | 2 +- esp3d/src/core/settings_esp3d.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/esp3d/src/core/settings_esp3d.cpp b/esp3d/src/core/settings_esp3d.cpp index dccd5427..e9e36fbf 100644 --- a/esp3d/src/core/settings_esp3d.cpp +++ b/esp3d/src/core/settings_esp3d.cpp @@ -56,7 +56,7 @@ #define MIN_NOTIFICATION_TOKEN_LENGTH 0 #define MIN_NOTIFICATION_SETTINGS_LENGTH 0 #define MAX_NOTIFICATION_TOKEN_LENGTH 63 -#define MAX_NOTIFICATION_SETTINGS_LENGTH 127 +#define MAX_NOTIFICATION_SETTINGS_LENGTH 128 #define MAX_SERVER_ADDRESS_LENGTH 128 #define MIN_SERVER_ADDRESS_LENGTH 0 diff --git a/esp3d/src/core/settings_esp3d.h b/esp3d/src/core/settings_esp3d.h index 93b34ca9..447cd5a7 100644 --- a/esp3d/src/core/settings_esp3d.h +++ b/esp3d/src/core/settings_esp3d.h @@ -75,23 +75,23 @@ #define ESP_TIME_SERVER1 464 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese #define ESP_TIME_SERVER2 593 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese #define ESP_TIME_SERVER3 722 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese -#define ESP_SD_DEVICE_TYPE 850 //1 bytes = flag -#define ESP_SD_MOUNT 851 //1 bytes = flag -#define ESP_FREE_BYTE 852 //1 bytes = flag -#define ESP_DIRECT_SD_CHECK 853 //1 bytes = flag -#define ESP_SD_CHECK_UPDATE_AT_BOOT 854//1 bytes = flag -#define ESP_NOTIFICATION_SETTINGS 855 //128 bytes 127+1 = string ; warning does not support multibyte char like chinese -#define ESP_CALIBRATION_1 983 //4 bytes = int -#define ESP_CALIBRATION_2 987 //4 bytes = int -#define ESP_CALIBRATION_3 991 //4 bytes = int -#define ESP_CALIBRATION_4 995 //4 bytes = int -#define ESP_CALIBRATION_5 999 //4 bytes = int -#define ESP_AUTO_NOTIFICATION 1004 //1 byte = flag +#define ESP_SD_DEVICE_TYPE 851 //1 bytes = flag +#define ESP_SD_MOUNT 852 //1 bytes = flag +#define ESP_FREE_BYTE 853 //1 bytes = flag +#define ESP_DIRECT_SD_CHECK 854 //1 bytes = flag +#define ESP_SD_CHECK_UPDATE_AT_BOOT 855//1 bytes = flag +#define ESP_NOTIFICATION_SETTINGS 856 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese +#define ESP_CALIBRATION_1 985 //4 bytes = int +#define ESP_CALIBRATION_2 989 //4 bytes = int +#define ESP_CALIBRATION_3 993 //4 bytes = int +#define ESP_CALIBRATION_4 997 //4 bytes = int +#define ESP_CALIBRATION_5 1001 //4 bytes = int #define ESP_CAMERA_PORT 1005 //4 bytes = int #define ESP_FTP_CTRL_PORT 1009 //4 bytes = int #define ESP_FTP_DATA_ACTIVE_PORT 1013 //4 bytes = int #define ESP_FTP_DATA_PASSIVE_PORT 1017 //4 bytes = int #define ESP_FTP_ON 1021 //1 byte = flag +#define ESP_AUTO_NOTIFICATION 1022 //1 byte = flag //Hidden password #define HIDDEN_PASSWORD "********"