mirror of
https://github.com/espruino/Espruino.git
synced 2025-12-08 19:06:15 +00:00
0054b39c00
- added variables_mode in config. build_platform_config.py - added define for variables_mode jsvar.h - added jsVarsSize; //size of jsVars for option malloc - added support of malloc jsVars in jsvInit jsvar.c - added definition jsVars for variables_mode_malloc jshardwareESP32.h - new file with functions to set/get enable status of BLE and Wifi jshardwareESP32.c - new file with functions to set/get enable status of BLE and Wifi ESP32.make - added jshardware.c to SOURCES main.c - added handling for Wifi enabled - added calculation for jsVars - initialise jsVars based on calculation jshardware.c - used new API call to get Serial Number, even if Wifi is not enabled - initialises BLE, if BLE is enabled (in NVS storage) bluetooth.c - check if BLE is enabled before initialising jswrap_esp32.h - defines functions to enable BLE and/or Wifi jswrap_esp32.c - wrapper for functions to enable BLE/Wifi, remove code from Flash, to avoid overflow in jsVars - added status for BLE/Wifi to ESP32.getStatus esp32_gap_func.c - get mac adress even if Wifi is not enabled Changes to be committed: modified: boards/ESP32.py modified: make/family/ESP32.make modified: scripts/build_platform_config.py modified: src/jsvar.c modified: src/jsvar.h modified: targets/esp32/BLE/esp32_gap_func.c modified: targets/esp32/bluetooth.c modified: targets/esp32/jshardware.c new file: targets/esp32/jshardwareESP32.c new file: targets/esp32/jshardwareESP32.h modified: targets/esp32/jswrap_esp32.c modified: targets/esp32/jswrap_esp32.h modified: targets/esp32/main.c
111 lines
3.1 KiB
C
111 lines
3.1 KiB
C
#include "freertos/FreeRTOS.h"
|
|
#include "esp_wifi.h"
|
|
#include "esp_system.h"
|
|
#include "esp_event.h"
|
|
#include "esp_event_loop.h"
|
|
#include "nvs_flash.h"
|
|
|
|
#include <stdio.h>
|
|
#include <jsdevices.h>
|
|
#include <jsinteractive.h>
|
|
#include "rtosutil.h"
|
|
#include "jstimer.h"
|
|
#include "jshardwareUart.h"
|
|
#include "jshardwareAnalog.h"
|
|
#include "jshardwareTimer.h"
|
|
#include "jshardwarePWM.h"
|
|
#include "jshardwarePulse.h"
|
|
#include "jshardwareSpi.h"
|
|
#include "jshardwareESP32.h"
|
|
#include "jswrap_wifi.h" // jswrap_wifi_restore
|
|
|
|
#ifdef BLUETOOTH
|
|
#include "libs/bluetooth/bluetooth.h"
|
|
#include "BLE/esp32_gap_func.h"
|
|
#endif
|
|
|
|
#include "esp_spi_flash.h"
|
|
#include "spi_flash/include/esp_partition.h"
|
|
#include "esp_log.h"
|
|
|
|
#include "jsvar.h"
|
|
|
|
|
|
extern void initialise_wifi(void);
|
|
|
|
static void uartTask(void *data) {
|
|
initConsole();
|
|
while(1) {
|
|
consoleToEspruino();
|
|
serialToEspruino();
|
|
}
|
|
}
|
|
|
|
static void espruinoTask(void *data) {
|
|
int heapVars;
|
|
PWMInit();
|
|
RMTInit();
|
|
SPIChannelsInit();
|
|
initADC(1);
|
|
jshInit(); // Initialize the hardware
|
|
if(ESP32_Get_NVS_Status(ESP_NETWORK_WIFI)) jswrap_wifi_restore();
|
|
heapVars = (esp_get_free_heap_size() - 40000) / 16; //calculate space for jsVars
|
|
heapVars = heapVars - heapVars % 100; //round to 100
|
|
if(heapVars > 20000) heapVars = 20000; //WROVER boards have much more RAM, so we set a limit
|
|
jsVarsSize = heapVars;
|
|
jsvInit(); // Initialize the variables
|
|
// not sure why this delay is needed?
|
|
vTaskDelay(200 / portTICK_PERIOD_MS);
|
|
jsiInit(true); // Initialize the interactive subsystem
|
|
#ifdef BLUETOOTH
|
|
bluetooth_initDeviceName();
|
|
#endif
|
|
while(1) {
|
|
jsiLoop(); // Perform the primary loop processing
|
|
}
|
|
}
|
|
|
|
// memory mapped address of js_code partition in flash.
|
|
char* romdata_jscode=0;
|
|
|
|
/**
|
|
* The main entry point into Espruino on an ESP32.
|
|
*/
|
|
int app_main(void)
|
|
{
|
|
esp_log_level_set("*", ESP_LOG_ERROR); // set all components to ERROR level - suppress Wifi Info
|
|
nvs_flash_init();
|
|
#ifdef BLUETOOTH
|
|
jsble_init();
|
|
#endif
|
|
spi_flash_init();
|
|
tcpip_adapter_init();
|
|
timers_Init();
|
|
timer_Init("EspruinoTimer",0,0,0);
|
|
|
|
// Map the js_code partition into memory so can be accessed by E.setBootCode("")
|
|
const esp_partition_t* part;
|
|
spi_flash_mmap_handle_t hrom;
|
|
esp_err_t err;
|
|
esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, "js_code");
|
|
if (it==0) jsError("Couldn't find js_code partition - update with partition_espruino.bin\n");
|
|
else {
|
|
const esp_partition_t *p = esp_partition_get(it);
|
|
err=esp_partition_mmap(p, 0, p->size, SPI_FLASH_MMAP_DATA, (const void**)&romdata_jscode, &hrom);
|
|
if (err!=ESP_OK) jsError("Couldn't map js_code!\n");
|
|
// The mapping in hrom is never released - as js code can be called at anytime
|
|
}
|
|
esp_partition_iterator_release(it);
|
|
|
|
#ifdef RTOS
|
|
queues_init();
|
|
tasks_init();
|
|
task_init(espruinoTask,"EspruinoTask",25000,5,0);
|
|
task_init(uartTask,"ConsoleTask",2200,20,0);
|
|
#else
|
|
xTaskCreatePinnedToCore(&espruinoTask, "espruinoTask", 25000, NULL, 5, NULL, 0);
|
|
xTaskCreatePinnedToCore(&uartTask,"uartTask",2200,NULL,20,NULL,0);
|
|
#endif
|
|
return 0;
|
|
}
|