Switch more things to new script.

esp32/optional/assemblers/assemblers.h

@@ -24,7 +24,7 @@
       PUSH assembler_source; PUSH sizeof(assembler_source) - 1) \
   PLATFORM_ASSEMBLER_SUPPORT
 
-{{assembler}}
+#include "esp32_assembler.h"
 
 #if defined(__riscv)
 
@@ -32,7 +32,7 @@
    XV(internals, "riscv-assembler-source", RISCV_ASSEMBLER_SOURCE, \
        PUSH riscv_assembler_source; PUSH sizeof(riscv_assembler_source) - 1)
 
-{{riscv_assembler}}
+#include "esp32_riscv-assembler.h"
 
 #else
 
@@ -40,6 +40,6 @@
    XV(internals, "xtensa-assembler-source", XTENSA_ASSEMBLER_SOURCE, \
        PUSH xtensa_assembler_source; PUSH sizeof(xtensa_assembler_source) - 1)
 
-{{xtensa_assembler}}
+#include "esp32_xtensa-assembler.h"
 
 #endif

esp32/optional/camera/camera.h

@@ -31,4 +31,4 @@
   YV(camera, esp_camera_save_to_nvs, n0 = esp_camera_save_to_nvs(c0)) \
   YV(camera, esp_camera_load_from_nvs, n0 = esp_camera_load_from_nvs(c0))
 
-{{camera}}
+#include "esp32_camera.h"

esp32/optional/interrupts/interrupts.h

@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/*
+ * ESP32forth Interrupts v{{VERSION}}
+ * Revision: {{REVISION}}
+ */
+
 #define INTERRUPT_STACK_CELLS 64
 
 #include "esp_intr_alloc.h"
@@ -149,4 +154,4 @@ static cell_t TimerIsrCallbackAdd(cell_t group, cell_t timer, cell_t xt, cell_t
   return timer_isr_callback_add((timer_group_t) group, (timer_idx_t) timer, HandleInterruptAndRet, args, flags);
 }
 
-{{interrupts}}
+#include "esp32_interrupts.h"

esp32/optional/oled/oled.h

@@ -55,4 +55,4 @@ static Adafruit_SSD1306 *oled_display = 0;
   YV(oled, OledRectR, oled_display->drawRoundRect(n5, n4, n3, n2, n1, n0); DROPn(5)) \
   YV(oled, OledRectRF, oled_display->fillRoundRect(n5, n4, n3, n2, n1, n0 ); DROPn(5))
 
-{{oled}}
+#include "esp32_oled.h"

esp32/optional/rmt.h

@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/*
+ * ESP32forth RMT v{{VERSION}}
+ * Revision: {{REVISION}}
+ */
+
 #include "driver/rmt.h"
 
 #define OPTIONAL_RMT_VOCABULARY V(rmt)

esp32/optional/serial-bluetooth/serial-bluetooth.h

@@ -47,4 +47,4 @@
   /* Bluetooth */ \
   YV(bluetooth, esp_bt_dev_get_address, PUSH esp_bt_dev_get_address())
 
-{{serial_bluetooth}}
+#include "esp32_serial-bluetooth.h"

esp32/optional/spi-flash/spi-flash.h

@@ -77,4 +77,4 @@
       n0 = esp_partition_check_identity((const esp_partition_t *) a1, \
                                         (const esp_partition_t *) a0); NIP)
 
-{{spi_flash}}
+#include "esp32_spi-flash.h"