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

Fix optionals, bump version.

Browse Source 
Tried on real hardware.
This commit is contained in:
Brad Nelson
2023-07-07 17:16:20 -07:00
parent 998d619355
commit 235a4a0c45
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION=7.0.7.13 VERSION=7.0.7.14
STABLE_VERSION=7.0.6.19 STABLE_VERSION=7.0.6.19
OLD_STABLE_VERSION=7.0.5.4 OLD_STABLE_VERSION=7.0.5.4
REVISION=$(shell git rev-parse HEAD | head -c 20) REVISION=$(shell git rev-parse HEAD | head -c 20)
@ -287,21 +287,28 @@ ESP32_BOOT = $(COMMON_PHASE1) \
$(GEN)/esp32_boot.h: tools/source_to_string.js $(ESP32_BOOT) | $(GEN) $(GEN)/esp32_boot.h: tools/source_to_string.js $(ESP32_BOOT) | $(GEN)
$< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@ $< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@
$(GEN)/esp32_assembler.h: tools/source_to_string.js common/assembler.fs | $(GEN) $(GEN)/esp32_assembler.h: \
$< assembler_source $(VERSION) $(REVISION) common/assembler.fs >$@ tools/source_to_string.js \
common/assembler.fs | $(GEN)
$< assembler_source $(VERSION) $(REVISION) \
common/assembler.fs >$@
$(GEN)/esp32_xtensa-assembler.h: \ $(GEN)/esp32_xtensa-assembler.h: \
tools/source_to_string.js esp32/optional/assemblers/xtensa-assembler.fs | $(GEN) tools/source_to_string.js \
esp32/optional/assemblers/xtensa-assembler.fs | $(GEN)
$< xtensa_assembler_source $(VERSION) $(REVISION) \ $< xtensa_assembler_source $(VERSION) $(REVISION) \
esp32/optional/assemblers/xtensa-assembler.fs >$@ esp32/optional/assemblers/xtensa-assembler.fs >$@
$(GEN)/esp32_riscv-assembler.h: \ $(GEN)/esp32_riscv-assembler.h: \
tools/source_to_string.js esp32/optional/assemblers/riscv-assembler.fs | $(GEN) tools/source_to_string.js \
esp32/optional/assemblers/riscv-assembler.fs | $(GEN)
$< riscv_assembler_source $(VERSION) $(REVISION) \ $< riscv_assembler_source $(VERSION) $(REVISION) \
esp32/optional/assemblers/riscv-assembler.fs >$@ esp32/optional/assemblers/riscv-assembler.fs >$@
$(GEN)/esp32_camera.h: \ $(GEN)/esp32_camera.h: \
tools/source_to_string.js esp32/optional/camera/camera.fs | $(GEN) tools/source_to_string.js \
esp32/optional/camera/camera_server.fs \
esp32/optional/camera/camera.fs | $(GEN)
$< camera_source $(VERSION) $(REVISION) \ $< camera_source $(VERSION) $(REVISION) \
esp32/optional/camera/camera.fs \ esp32/optional/camera/camera.fs \
esp32/optional/camera/camera_server.fs >$@ esp32/optional/camera/camera_server.fs >$@
@ -317,8 +324,11 @@ $(GEN)/esp32_spi-flash.h: \
esp32/optional/spi-flash/spi-flash.fs >$@ esp32/optional/spi-flash/spi-flash.fs >$@
$(GEN)/esp32_serial-bluetooth.h: \ $(GEN)/esp32_serial-bluetooth.h: \
tools/source_to_string.js esp32/optional/serial-bluetooth/bterm.fs | $(GEN) tools/source_to_string.js \
$< bterm_source $(VERSION) $(REVISION) \ esp32/optional/serial-bluetooth/bterm.fs \
esp32/optional/serial-bluetooth/serial-bluetooth.fs | $(GEN)
$< serial_bluetooth_source $(VERSION) $(REVISION) \
esp32/optional/serial-bluetooth/serial-bluetooth.fs \
esp32/optional/serial-bluetooth/bterm.fs >$@ esp32/optional/serial-bluetooth/bterm.fs >$@
OPTIONAL_MODULES = \ OPTIONAL_MODULES = \

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

@ -24,8 +24,8 @@
#endif #endif
#define OPTIONAL_BLUETOOTH_VOCABULARY V(bluetooth) #define OPTIONAL_BLUETOOTH_VOCABULARY V(bluetooth)
#define OPTIONAL_SERIAL_BLUETOOTH_SUPPORT \ #define OPTIONAL_SERIAL_BLUETOOTH_SUPPORT \
XV(internals, "bterm-source", BTERM_SOURCE, \ XV(internals, "serial-bluetooth-source", SERIAL_BLUETOOTH_SOURCE, \
PUSH bterm_source; PUSH sizeof(bterm_source) - 1) \ PUSH serial_bluetooth_source; PUSH sizeof(serial_bluetooth_source) - 1) \
XV(bluetooth, "SerialBT.new", SERIALBT_NEW, PUSH new BluetoothSerial()) \ XV(bluetooth, "SerialBT.new", SERIALBT_NEW, PUSH new BluetoothSerial()) \
XV(bluetooth, "SerialBT.delete", SERIALBT_DELETE, delete bt0; DROP) \ XV(bluetooth, "SerialBT.delete", SERIALBT_DELETE, delete bt0; DROP) \
XV(bluetooth, "SerialBT.begin", SERIALBT_BEGIN, n0 = bt0->begin(c2, n1); NIPn(2)) \ XV(bluetooth, "SerialBT.begin", SERIALBT_BEGIN, n0 = bt0->begin(c2, n1); NIPn(2)) \

2
esp32/optional/spi-flash/spi-flash.h
View File

@ -23,7 +23,7 @@
#endif #endif
#define OPTIONAL_SPI_FLASH_VOCABULARY V(spi_flash) #define OPTIONAL_SPI_FLASH_VOCABULARY V(spi_flash)
#define OPTIONAL_SPI_FLASH_SUPPORT \ #define OPTIONAL_SPI_FLASH_SUPPORT \
XV(internals, "spi_flash-source", SPI_FLASH_SOURCE, \ XV(internals, "spi-flash-source", SPI_FLASH_SOURCE, \
PUSH spi_flash_source; PUSH sizeof(spi_flash_source) - 1) \ PUSH spi_flash_source; PUSH sizeof(spi_flash_source) - 1) \
YV(spi_flash, spi_flash_init, spi_flash_init()) \ YV(spi_flash, spi_flash_init, spi_flash_init()) \
YV(spi_flash, spi_flash_get_chip_size, PUSH spi_flash_get_chip_size()) \ YV(spi_flash, spi_flash_get_chip_size, PUSH spi_flash_get_chip_size()) \