mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14395 from arendst/revert-14383-cmini_esp32 

Revert "Prep for a custom minimal ESP32 variant"
This commit is contained in:
Jason2866 2022-01-12 12:56:34 +01:00 committed by GitHub
parent 9f44b17b09 fd1fa993a3
commit 6e80065635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libesp32/berry_tasmota/src/be_port.cpp
View File

@ -101,7 +101,6 @@ BERRY_API void be_writebuffer(const char *buffer, size_t length)
extern "C" {
int m_path_listdir(bvm *vm)
{
#ifdef USE_UFILESYS
if (be_top(vm) >= 1 && be_isstring(vm, 1)) {
const char *path = be_tostring(vm, 1);
be_newobject(vm, "list");
@ -127,7 +126,6 @@ extern "C" {
be_return(vm);
}
#endif // USE_UFILESYS
be_return_nil(vm);
}
}
@ -138,9 +136,10 @@ BERRY_API char* be_readstring(char *buffer, size_t size)
}
/* use the standard library implementation file API. */
#ifdef USE_UFILESYS
void* be_fopen(const char *filename, const char *modes)
{
#ifdef USE_UFILESYS
if (filename != nullptr && modes != nullptr) {
char fname2[strlen(filename) + 2];
if (filename[0] == '/') {
@ -157,24 +156,23 @@ void* be_fopen(const char *filename, const char *modes)
return f_ptr;
}
}
#endif // USE_UFILESYS
return nullptr;
// return fopen(filename, modes);
}
#endif // USE_UFILESYS
#ifdef USE_UFILESYS
// Tasmota specific, get the underlying Arduino File
File * be_get_arduino_file(void *hfile)
{
#ifdef USE_UFILESYS
if (hfile != nullptr) {
File * f_ptr = (File*) hfile;
return f_ptr;
}
#endif // USE_UFILESYS
return nullptr;
// return fopen(filename, modes);
}
#endif
int be_fclose(void *hfile)
{

8
tasmota/my_user_config.h
View File

@ -1095,6 +1095,10 @@
* No user configurable items below
\*********************************************************************************************/
#ifdef USE_CONFIG_OVERRIDE
#include "user_config_override.h" // Configuration overrides for my_user_config.h
#endif
#if defined(USE_DISCOVERY) && (defined(USE_MQTT_AWS_IOT) || defined(USE_MQTT_AWS_IOT_LIGHT))
#error "Select either USE_DISCOVERY or USE_MQTT_AWS_IOT, mDNS takes too much code space and is not needed for AWS IoT"
#endif
@ -1127,8 +1131,4 @@
#define USE_TLS // flag indicates we need to include TLS code
#endif
#ifdef USE_CONFIG_OVERRIDE
#include "user_config_override.h" // Configuration overrides for my_user_config.h
#endif
#endif // _MY_USER_CONFIG_H_

15
tasmota/tasmota_configurations.h
View File

@ -920,21 +920,6 @@
#undef FIRMWARE_KNX_NO_EMULATION // Disable tasmota-knx with KNX but without Emulation
#undef FIRMWARE_DISPLAYS // Disable tasmota-display with display drivers enabled
#undef FIRMWARE_IR // Disable tasmota-ir with IR full protocols activated
#undef FIRMWARE_WEBCAM
#undef FIRMWARE_ODROID_GO
#undef FIRMWARE_M5STACK_CORE2
#undef FIRMWARE_BLUETOOTH
#undef FIRMWARE_LVGL
#undef FIRMWARE_TASMOTA32
#undef USE_UFILESYS
#undef GUI_TRASH_FILE
#undef GUI_EDIT_FILE
#undef USE_PING
#undef USE_AUTOCONF
#undef USE_BERRY
#undef USE_WEBCLIENT
#undef USE_WEBCLIENT_HTTPS
//#undef USE_TLS // needed for MQTT over TLS
#endif // FIRMWARE_MINICUSTOM