Merge remote-tracking branch 'upstream/master'

Conflicts: boards.txt cores/esp32/Arduino.h cores/esp32/wiring_private.h cores/esp32/wiring_shift.c

Author: ladyada

Kconfig

@@ -0,0 +1,107 @@
+menu "Arduino Configuration"
+
+choice MONITOR_BAUD
+ prompt "Monitor baud rate"
+ default MONITOR_BAUD_115200B
+ help
+ Baud rate to use while monitoring the ESP chip.
+
+config MONITOR_BAUD_9600B
+ bool "9600 bps"
+config MONITOR_BAUD_57600B
+ bool "57600 bps"
+config MONITOR_BAUD_115200B
+ bool "115200 bps"
+config MONITOR_BAUD_230400B
+ bool "230400 bps"
+config MONITOR_BAUD_921600B
+ bool "921600 bps"
+config MONITOR_BAUD_2MB
+ bool "2 Mbps"
+config MONITOR_BAUD_OTHER
+ bool "Custom baud rate"
+
+endchoice
+
+config MONITOR_BAUD_OTHER_VAL
+ int "Custom baud rate value" if MONITOR_BAUD_OTHER
+ default 115200
+
+config MONITOR_BAUD
+ int
+ default 9600 if MONITOR_BAUD_9600B
+ default 57600 if MONITOR_BAUD_57600B
+ default 115200 if MONITOR_BAUD_115200B
+ default 230400 if MONITOR_BAUD_230400B
+ default 921600 if MONITOR_BAUD_921600B
+ default 2000000 if MONITOR_BAUD_2MB
+ default MONITOR_BAUD_OTHER_VAL if MONITOR_BAUD_OTHER
+
+config AUTOSTART_ARDUINO
+ bool "Autostart Arduino setup and loop on boot"
+ default "n"
+ help
+ Enabling this option will implement app_main and start Arduino.
+ All you need to implement in your main.cpp is setup() and loop()
+ and include Arduino.h
+ If disabled, you can call initArduino() to run any preparations
+ required by the framework
+
+config DISABLE_HAL_LOCKS
+ bool "Disable mutex locks for HAL"
+ default "n"
+ help
+ Enabling this option will run all hardware abstraction without locks.
+ While communication with external hardware will be faster, you need to
+ make sure that there is no option to use the same bus from another thread
+ or interrupt at the same time. Option is best used with Arduino enabled
+ and code implemented only in setup/loop and Arduino callbacks
+
+menu "Debug Log Configuration"
+choice ARDUHAL_LOG_DEFAULT_LEVEL
+ bool "Default log level"
+ default ARDUHAL_LOG_DEFAULT_LEVEL_ERROR
+ help
+ Specify how much output to see in logs by default.
+
+config ARDUHAL_LOG_DEFAULT_LEVEL_NONE
+ bool "No output"
+config ARDUHAL_LOG_DEFAULT_LEVEL_ERROR
+ bool "Error"
+config ARDUHAL_LOG_DEFAULT_LEVEL_WARN
+ bool "Warning"
+config ARDUHAL_LOG_DEFAULT_LEVEL_INFO
+ bool "Info"
+config ARDUHAL_LOG_DEFAULT_LEVEL_DEBUG
+ bool "Debug"
+config ARDUHAL_LOG_DEFAULT_LEVEL_VERBOSE
+ bool "Verbose"
+endchoice
+
+config ARDUHAL_LOG_DEFAULT_LEVEL
+ int
+ default 0 if ARDUHAL_LOG_DEFAULT_LEVEL_NONE
+ default 1 if ARDUHAL_LOG_DEFAULT_LEVEL_ERROR
+ default 2 if ARDUHAL_LOG_DEFAULT_LEVEL_WARN
+ default 3 if ARDUHAL_LOG_DEFAULT_LEVEL_INFO
+ default 4 if ARDUHAL_LOG_DEFAULT_LEVEL_DEBUG
+ default 5 if ARDUHAL_LOG_DEFAULT_LEVEL_VERBOSE
+
+config ARDUHAL_LOG_COLORS
+ bool "Use ANSI terminal colors in log output"
+ default "n"
+ help
+ Enable ANSI terminal color codes in bootloader output.
+ In order to view these, your terminal program must support ANSI color codes.
+
+endmenu
+
+config AUTOCONNECT_WIFI
+ bool "Autoconnect WiFi on boot"
+ default "n"
+ depends on AUTOSTART_ARDUINO
+ help
+ If enabled, WiFi will connect to the last used SSID (if station was enabled),
+ else connection will be started only after calling WiFi.begin(ssid, password)
+
+endmenu

Makefile.projbuild

@@ -0,0 +1,3 @@
+#build with "make flash monitor" to upload and open serial monitor
+monitor:
+ $(Q) miniterm.py --rts 0 --dtr 0 --raw $(ESPPORT) $(CONFIG_MONITOR_BAUD)

boards.txt

@@ -201,7 +201,6 @@ espea32.menu.UploadSpeed.460800.upload.speed=460800
 espea32.menu.UploadSpeed.512000.windows=512000
 espea32.menu.UploadSpeed.512000.upload.speed=512000
 
-
 ##############################################################
 featheresp32.name=Feather ESP32
 
@@ -240,4 +239,84 @@ featheresp32.menu.UploadSpeed.460800.linux=460800
 featheresp32.menu.UploadSpeed.460800.macosx=460800
 featheresp32.menu.UploadSpeed.460800.upload.speed=460800
 featheresp32.menu.UploadSpeed.512000.windows=512000
-featheresp32.menu.UploadSpeed.512000.upload.speed=512000
+featheresp32.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+quantum.name=Noduino Quantum
+
+quantum.upload.tool=esptool
+quantum.upload.maximum_size=1044464
+quantum.upload.maximum_data_size=294912
+quantum.upload.wait_for_upload_port=true
+
+quantum.serial.disableDTR=true
+quantum.serial.disableRTS=true
+
+quantum.build.mcu=esp32
+quantum.build.core=esp32
+quantum.build.variant=quantum
+quantum.build.board=QUANTUM
+
+quantum.build.f_cpu=160000000L
+quantum.build.flash_mode=qio
+quantum.build.flash_size=16MB
+
+quantum.menu.FlashFreq.80=80MHz
+quantum.menu.FlashFreq.80.build.flash_freq=80m
+quantum.menu.FlashFreq.40=40MHz
+quantum.menu.FlashFreq.40.build.flash_freq=40m
+
+quantum.menu.UploadSpeed.921600=921600
+quantum.menu.UploadSpeed.921600.upload.speed=921600
+quantum.menu.UploadSpeed.115200=115200
+quantum.menu.UploadSpeed.115200.upload.speed=115200
+quantum.menu.UploadSpeed.256000.windows=256000
+quantum.menu.UploadSpeed.256000.upload.speed=256000
+quantum.menu.UploadSpeed.230400.windows.upload.speed=256000
+quantum.menu.UploadSpeed.230400=230400
+quantum.menu.UploadSpeed.230400.upload.speed=230400
+quantum.menu.UploadSpeed.460800.linux=460800
+quantum.menu.UploadSpeed.460800.macosx=460800
+quantum.menu.UploadSpeed.460800.upload.speed=460800
+quantum.menu.UploadSpeed.512000.windows=512000
+quantum.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+node32s.name=Node32s
+
+node32s.upload.tool=esptool
+node32s.upload.maximum_size=1044464
+node32s.upload.maximum_data_size=294912
+node32s.upload.wait_for_upload_port=true
+
+node32s.serial.disableDTR=true
+node32s.serial.disableRTS=true
+
+node32s.build.mcu=esp32
+node32s.build.core=esp32
+node32s.build.variant=node32s
+node32s.build.board=Node32s
+
+node32s.build.f_cpu=160000000L
+node32s.build.flash_mode=dio
+node32s.build.flash_size=4MB
+
+node32s.menu.FlashFreq.80=80MHz
+node32s.menu.FlashFreq.80.build.flash_freq=80m
+node32s.menu.FlashFreq.40=40MHz
+node32s.menu.FlashFreq.40.build.flash_freq=40m
+
+node32s.menu.UploadSpeed.921600=921600
+node32s.menu.UploadSpeed.921600.upload.speed=921600
+node32s.menu.UploadSpeed.115200=115200
+node32s.menu.UploadSpeed.115200.upload.speed=115200
+node32s.menu.UploadSpeed.256000.windows=256000
+node32s.menu.UploadSpeed.256000.upload.speed=256000
+node32s.menu.UploadSpeed.230400.windows.upload.speed=256000
+node32s.menu.UploadSpeed.230400=230400
+node32s.menu.UploadSpeed.230400.upload.speed=230400
+node32s.menu.UploadSpeed.460800.linux=460800
+node32s.menu.UploadSpeed.460800.macosx=460800
+node32s.menu.UploadSpeed.460800.upload.speed=460800
+node32s.menu.UploadSpeed.512000.windows=512000
+node32s.menu.UploadSpeed.512000.upload.speed=512000

component.mk

@@ -1,5 +1,4 @@
 COMPONENT_ADD_INCLUDEDIRS := cores/esp32 variants/esp32 libraries/WiFi/src libraries/SPI/src libraries/Wire/src
 COMPONENT_PRIV_INCLUDEDIRS := cores/esp32/libb64
 COMPONENT_SRCDIRS := cores/esp32/libb64 cores/esp32 variants/esp32 libraries/WiFi/src libraries/SPI/src libraries/Wire/src
-include$(IDF_PATH)/make/component_common.mk
 CXXFLAGS += -fno-rtti

cores/esp32/Arduino.h

@@ -121,9 +121,8 @@ typedef bool boolean;
 typedefuint8_t byte;
 typedefunsignedint word;
 
-// Shifty prototypes
-voidshiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 uint8_tshiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+voidshiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 
 #ifdef __cplusplus
 }
@@ -147,8 +146,14 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 #include"HardwareSerial.h"
 #include"Esp.h"
 
+// WMath prototypes
+longrandom(long);
 #endif/* __cplusplus */
 
+longrandom(long, long);
+voidrandomSeed(unsignedlong);
+longmap(long, long, long, long, long);
+
 #ifndef _GLIBCXX_VECTOR
 // arduino is not compatible with std::vector
 #definemin(a,b) ((a)<(b)?(a):(b))
@@ -158,12 +163,6 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 #define_min(a,b) ((a)<(b)?(a):(b))
 #define_max(a,b) ((a)>(b)?(a):(b))
 
-// WMath prototypes
-longrandom(long, long);
-//long random(long);
-voidrandomSeed(unsignedlong);
-longmap(long, long, long, long, long);
-
 #include"pins_arduino.h"
 
 #endif /* _ESP32_CORE_ARDUINO_H_ */

cores/esp32/HardwareSerial.h

@@ -46,6 +46,10 @@ class HardwareSerial: public Stream
 size_twrite(uint8_t);
 size_twrite(constuint8_t *buffer, size_t size);
 
+inlinesize_twrite(constchar * s)
+{
+returnwrite((uint8_t*) s, strlen(s));
+ }
 inlinesize_twrite(unsignedlong n)
 {
 returnwrite((uint8_t) n);

cores/esp32/esp32-hal-i2c.c

@@ -30,7 +30,9 @@
 
 structi2c_struct_t{
 i2c_dev_t*dev;
+#if !CONFIG_DISABLE_HAL_LOCKS
 xSemaphoreHandlelock;
+#endif
 uint8_tnum;
 };
 
@@ -42,13 +44,23 @@ enum{
 I2C_CMD_END
 };
 
+#ifCONFIG_DISABLE_HAL_LOCKS
+#defineI2C_MUTEX_LOCK()
+#defineI2C_MUTEX_UNLOCK()
+
+statici2c_t_i2c_bus_array[2] ={
+{(volatilei2c_dev_t*)(DR_REG_I2C_EXT_BASE), 0},
+{(volatilei2c_dev_t*)(DR_REG_I2C1_EXT_BASE), 1}
+};
+#else
 #defineI2C_MUTEX_LOCK() do{} while (xSemaphoreTake(i2c->lock, portMAX_DELAY) != pdPASS)
 #defineI2C_MUTEX_UNLOCK() xSemaphoreGive(i2c->lock)
 
 statici2c_t_i2c_bus_array[2] ={
 {(volatilei2c_dev_t*)(DR_REG_I2C_EXT_BASE), NULL, 0},
 {(volatilei2c_dev_t*)(DR_REG_I2C1_EXT_BASE), NULL, 1}
 };
+#endif
 
 i2c_err_ti2cAttachSCL(i2c_t*i2c, int8_tscl)
 {
@@ -112,6 +124,13 @@ void i2cSetCmd(i2c_t * i2c, uint8_t index, uint8_t op_code, uint8_t byte_num, bo
 i2c->dev->command[index].op_code=op_code;
 }
 
+voidi2cResetCmd(i2c_t*i2c){
+inti;
+for(i=0;i<16;i++){
+i2c->dev->command[i].val=0;
+ }
+}
+
 voidi2cResetFiFo(i2c_t*i2c)
 {
 i2c->dev->fifo_conf.tx_fifo_rst=1;
@@ -138,6 +157,7 @@ i2c_err_t i2cWrite(i2c_t * i2c, uint16_t address, bool addr_10bit, uint8_t * dat
 uint8_tdataSend=willSend;
 
 i2cResetFiFo(i2c);
+i2cResetCmd(i2c);
 
 //CMD START
 i2cSetCmd(i2c, 0, I2C_CMD_RSTART, 0, false, false, false);
@@ -222,6 +242,7 @@ i2c_err_t i2cRead(i2c_t * i2c, uint16_t address, bool addr_10bit, uint8_t * data
 I2C_MUTEX_LOCK();
 
 i2cResetFiFo(i2c);
+i2cResetCmd(i2c);
 
 //CMD START
 i2cSetCmd(i2c, 0, I2C_CMD_RSTART, 0, false, false, false);
@@ -344,12 +365,14 @@ i2c_t * i2cInit(uint8_t i2c_num, uint16_t slave_addr, bool addr_10bit_en)
 
 i2c_t*i2c=&_i2c_bus_array[i2c_num];
 
+#if !CONFIG_DISABLE_HAL_LOCKS
 if(i2c->lock==NULL){
 i2c->lock=xSemaphoreCreateMutex();
 if(i2c->lock==NULL){
 returnNULL;
  }
  }
+#endif
 
 if(i2c_num==0){
 SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG,DPORT_I2C_EXT0_CLK_EN);

cores/esp32/esp32-hal-ledc.c

@@ -22,11 +22,14 @@
 #include"soc/ledc_reg.h"
 #include"soc/ledc_struct.h"
 
-xSemaphoreHandle_ledc_sys_lock;
-
-
+#ifCONFIG_DISABLE_HAL_LOCKS
+#defineLEDC_MUTEX_LOCK()
+#defineLEDC_MUTEX_UNLOCK()
+#else
 #defineLEDC_MUTEX_LOCK() do{} while (xSemaphoreTake(_ledc_sys_lock, portMAX_DELAY) != pdPASS)
 #defineLEDC_MUTEX_UNLOCK() xSemaphoreGive(_ledc_sys_lock)
+xSemaphoreHandle_ledc_sys_lock;
+#endif
 
 /*
  * LEDC Chan to Group/Channel/Timer Mapping
@@ -59,7 +62,9 @@ void ledcSetupTimer(uint8_t chan, uint32_t div_num, uint8_t bit_num, bool apb_cl
 SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_LEDC_CLK_EN);
 CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_LEDC_RST);
 ledc_dev->conf.apb_clk_sel=1;//LS use apb clock
+#if !CONFIG_DISABLE_HAL_LOCKS
 _ledc_sys_lock=xSemaphoreCreateMutex();
+#endif
  }
 LEDC_MUTEX_LOCK();
 ledc_dev->timer_group[group].timer[timer].conf.div_num=div_num;//18 bit (10.8) This register is used to configure parameter for divider in timer the least significant eight bits represent the decimal part.