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

Fixed some bugs with build in modules.

Browse Source
This commit is contained in:
Brad Nelson
2023-07-06 22:55:18 -07:00
parent 7b74cddf2d
commit a5f9ca1b35
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -162,6 +162,9 @@ fast: posix esp32_sim esp32
targets: $(TARGETS) targets: $(TARGETS)
tests: $(TESTS) tests: $(TESTS)
clean-esp32:
rm -rf $(ESP32)/esp32*_build $(ESP32)/esp32*_cache
clean: clean:
rm -rf $(OUT) rm -rf $(OUT)
@ -305,7 +308,7 @@ $(GEN)/esp32_camera.h: \
$(GEN)/esp32_oled.h: \ $(GEN)/esp32_oled.h: \
tools/source_to_string.js esp32/optional/oled/oled.fs | $(GEN) tools/source_to_string.js esp32/optional/oled/oled.fs | $(GEN)
$< camera_source $(VERSION) $(REVISION) \ $< oled_source $(VERSION) $(REVISION) \
esp32/optional/oled/oled.fs >$@ esp32/optional/oled/oled.fs >$@
$(GEN)/esp32_spi-flash.h: \ $(GEN)/esp32_spi-flash.h: \
@ -656,6 +659,8 @@ $(ESP32)/ESP32forth/optional/spi-flash.h: \
ARDUINO_BUILDER="/mnt/c/Program Files (x86)/Arduino/arduino-builder.exe" ARDUINO_BUILDER="/mnt/c/Program Files (x86)/Arduino/arduino-builder.exe"
ARDUINO="c:/Program Files (x86)/Arduino" ARDUINO="c:/Program Files (x86)/Arduino"
LOCALAPPDATA=$(subst \,/,$(shell cmd.exe /c echo %LOCALAPPDATA%)) LOCALAPPDATA=$(subst \,/,$(shell cmd.exe /c echo %LOCALAPPDATA%))
USERPROFILE=$(subst \,/,$(shell cmd.exe /c echo %USERPROFILE%))
DOCUMENTS_ARDUINO=${USERPROFILE}/Documents/Arduino
ARDUINO_APP=${LOCALAPPDATA}/Arduino15 ARDUINO_APP=${LOCALAPPDATA}/Arduino15
ARDUINO_APP_DIR=$(subst C:/,/mnt/c/,${ARDUINO_APP}) ARDUINO_APP_DIR=$(subst C:/,/mnt/c/,${ARDUINO_APP})
ESPTOOL=${ARDUINO_APP_DIR}/packages/esp32/tools/esptool_py/4.2.1/esptool.exe ESPTOOL=${ARDUINO_APP_DIR}/packages/esp32/tools/esptool_py/4.2.1/esptool.exe
@ -685,6 +690,7 @@ $(ESP32)/%_build/ESP32forth.ino.bin: $(ESP32)/ESP32forth/ESP32forth.ino | \
-tools ${ARDUINO}/hardware/tools/avr \ -tools ${ARDUINO}/hardware/tools/avr \
-tools ${ARDUINO_APP}/packages \ -tools ${ARDUINO_APP}/packages \
-built-in-libraries ${ARDUINO}/libraries \ -built-in-libraries ${ARDUINO}/libraries \
-libraries ${DOCUMENTS_ARDUINO}/libraries \
-prefs=build.warn_data_percentage=75 \ -prefs=build.warn_data_percentage=75 \
${ESP32_BOARD_$(subst _build,,$(notdir $(word 1,$|)))} \ ${ESP32_BOARD_$(subst _build,,$(notdir $(word 1,$|)))} \
-build-path $(word 1,$|) \ -build-path $(word 1,$|) \

2
esp32/builtins.h
View File

@ -54,7 +54,7 @@
// Hook to pull in words from optional serial bluetooth support. // Hook to pull in words from optional serial bluetooth support.
# if __has_include("serial-bluetooth.h") # if __has_include("serial-bluetooth.h")
# include "bluetooth-serial.h" # include "serial-bluetooth.h"
# else # else
# define OPTIONAL_SERIAL_BLUETOOTH_SUPPORT # define OPTIONAL_SERIAL_BLUETOOTH_SUPPORT
# define OPTIONAL_BLUETOOTH_VOCABULARY # define OPTIONAL_BLUETOOTH_VOCABULARY

1
esp32/optional/serial-bluetooth/serial-bluetooth.h
View File

@ -46,6 +46,5 @@
XV(bluetooth, "SerialBT.isReady", SERIALBT_IS_READY, n0 = bt0->isReady(n2, n1); NIPn(2)) \ XV(bluetooth, "SerialBT.isReady", SERIALBT_IS_READY, n0 = bt0->isReady(n2, n1); NIPn(2)) \
/* Bluetooth */ \ /* Bluetooth */ \
YV(bluetooth, esp_bt_dev_get_address, PUSH esp_bt_dev_get_address()) YV(bluetooth, esp_bt_dev_get_address, PUSH esp_bt_dev_get_address())
#endif
{{serial_bluetooth}} {{serial_bluetooth}}