Merge pull request #14402 from Jason2866/custom_mini32

Prep for a custom minimal ESP32 variant
This commit is contained in:
Jason2866 2022-01-12 20:23:24 +01:00 committed by GitHub
commit b8c7e6dfa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 9 deletions

View File

@ -101,6 +101,7 @@ 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");
@ -126,6 +127,7 @@ extern "C" {
be_return(vm);
}
#endif // USE_UFILESYS
be_return_nil(vm);
}
}
@ -136,10 +138,9 @@ 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] == '/') {
@ -156,23 +157,24 @@ 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)
{

View File

@ -1095,10 +1095,6 @@
* 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
@ -1131,4 +1127,8 @@
#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_

View File

@ -920,6 +920,21 @@
#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