alx/ueforth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Brad Nelson
2022-01-31 15:37:16 -08:00
parent 06cd0186aa
commit 4e8b0b28f3
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ueforth/Makefile
View File

@ -312,8 +312,8 @@ $(ESP32_SIM):
mkdir -p $@ mkdir -p $@
$(GEN)/print-esp32-builtins: \ $(GEN)/print-esp32-builtins: \
esp32/print-builtins.c esp32/builtins.h | $(GEN) esp32/print-builtins.cpp esp32/builtins.h | $(GEN)
$(CC) $< -o $@ $(CXX) $(CFLAGS) $< -o $@
$(GEN)/esp32_sim_opcodes.h: $(GEN)/print-esp32-builtins | $(GEN) $(GEN)/esp32_sim_opcodes.h: $(GEN)/print-esp32-builtins | $(GEN)
$< >$@ $< >$@

6
ueforth/esp32/options.h
View File

@ -38,7 +38,7 @@
// RMT support designed around v2.0.1 toolchain. // RMT support designed around v2.0.1 toolchain.
// While ESP32 also has RMT, for now only include for // While ESP32 also has RMT, for now only include for
// ESP32-S2 and ESP32-C3. // ESP32-S2 and ESP32-C3.
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(SIM_PRINT_ONLY)
# define ENABLE_RMT_SUPPORT # define ENABLE_RMT_SUPPORT
#endif #endif
@ -55,9 +55,9 @@
// so this isn't an ideal indicator. // so this isn't an ideal indicator.
// Some boards (e.g. ESP32-S2-WROVER) don't seem to have // Some boards (e.g. ESP32-S2-WROVER) don't seem to have
// built the serial library, so check if its enabled as well. // built the serial library, so check if its enabled as well.
#ifdef BOARD_HAS_PSRAM #if defined(BOARD_HAS_PSRAM) || defined(SIM_PRINT_ONLY)
# define ENABLE_CAMERA_SUPPORT # define ENABLE_CAMERA_SUPPORT
# if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) # if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)) || defined(SIM_PRINT_ONLY)
# define ENABLE_SERIAL_BLUETOOTH_SUPPORT # define ENABLE_SERIAL_BLUETOOTH_SUPPORT
# endif # endif
#endif #endif

20
ueforth/esp32/print-builtins.c → ueforth/esp32/print-builtins.cpp
View File

@ -17,25 +17,7 @@
#include <stdio.h> #include <stdio.h>
#define SIM_PRINT_ONLY #define SIM_PRINT_ONLY
#include "esp32/options.h"
#define ENABLE_SPIFFS_SUPPORT
#define ENABLE_WIFI_SUPPORT
#define ENABLE_MDNS_SUPPORT
#define ENABLE_WEBSERVER_SUPPORT
#define ENABLE_I2C_SUPPORT
#define ENABLE_SOCKETS_SUPPORT
#define ENABLE_FREERTOS_SUPPORT
#define ENABLE_INTERRUPTS_SUPPORT
#define ENABLE_LEDC_SUPPORT
#define ENABLE_SD_SUPPORT
#define ENABLE_SPI_FLASH_SUPPORT
#define ENABLE_SD_MMC_SUPPORT
#define ENABLE_DAC_SUPPORT
#define ENABLE_RMT_SUPPORT
#define ENABLE_OLED_SUPPORT
#define ENABLE_SERIAL_BLUETOOTH_SUPPORT
#define FLOATING_POINT_LIST #define FLOATING_POINT_LIST
#define USER_WORDS #define USER_WORDS
#include "builtins.h" #include "builtins.h"