Add analogRead, touchRead, dacWrite and updated esp-idf

Author: me-no-dev

cores/esp32/esp32-hal-adc.c

@@ -0,0 +1,183 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include"esp32-hal-adc.h"
+#include"freertos/FreeRTOS.h"
+#include"freertos/task.h"
+#include"rom/ets_sys.h"
+#include"esp_attr.h"
+#include"esp_intr.h"
+#include"soc/rtc_io_reg.h"
+#include"soc/rtc_cntl_reg.h"
+#include"soc/sens_reg.h"
+
+staticuint8_t__analogAttenuation=0;//0db
+staticuint8_t__analogWidth=3;//12 bits
+staticuint8_t__analogCycles=8;
+staticuint8_t__analogSamples=0;//1 sample
+staticuint8_t__analogClockDiv=1;
+
+void__analogSetWidth(uint8_tbits){
+if(bits<9){
+bits=9;
+ } elseif(bits>12){
+bits=12;
+ }
+__analogWidth=bits-9;
+SET_PERI_REG_BITS(SENS_SAR_START_FORCE_REG, SENS_SAR1_BIT_WIDTH, __analogWidth, SENS_SAR1_BIT_WIDTH_S);
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL_REG, SENS_SAR1_SAMPLE_BIT, __analogWidth, SENS_SAR1_SAMPLE_BIT_S);
+
+SET_PERI_REG_BITS(SENS_SAR_START_FORCE_REG, SENS_SAR2_BIT_WIDTH, __analogWidth, SENS_SAR2_BIT_WIDTH_S);
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_SAMPLE_BIT, __analogWidth, SENS_SAR2_SAMPLE_BIT_S);
+}
+
+void__analogSetCycles(uint8_tcycles){
+__analogCycles=cycles;
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL_REG, SENS_SAR1_SAMPLE_CYCLE, __analogCycles, SENS_SAR1_SAMPLE_CYCLE_S);
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_SAMPLE_CYCLE, __analogCycles, SENS_SAR2_SAMPLE_CYCLE_S);
+}
+
+void__analogSetSamples(uint8_tsamples){
+if(!samples){
+return;
+ }
+__analogSamples=samples-1;
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL_REG, SENS_SAR1_SAMPLE_NUM, __analogSamples, SENS_SAR1_SAMPLE_NUM_S);
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_SAMPLE_NUM, __analogSamples, SENS_SAR2_SAMPLE_NUM_S);
+}
+
+void__analogSetClockDiv(uint8_tclockDiv){
+if(!clockDiv){
+return;
+ }
+__analogClockDiv=clockDiv;
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL_REG, SENS_SAR1_CLK_DIV, __analogClockDiv, SENS_SAR1_CLK_DIV_S);
+SET_PERI_REG_BITS(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_CLK_DIV, __analogClockDiv, SENS_SAR2_CLK_DIV_S);
+}
+
+void__analogSetAttenuation(uint8_tattenuation){
+__analogAttenuation=attenuation&3;
+uint32_tatt_data=0;
+inti=8;
+while(i--){
+att_data |= __analogAttenuation << (i*2);
+ }
+SET_PERI_REG_BITS(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DATA_SAR, att_data, SENS_MEAS1_DATA_SAR_S);
+SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_DATA_SAR, att_data, SENS_MEAS2_DATA_SAR_S);
+}
+
+voidIRAM_ATTR__analogInit(){
+staticboolinitialized= false;
+if(initialized){
+return;
+ }
+__analogSetAttenuation(__analogAttenuation);
+__analogSetCycles(__analogCycles);
+__analogSetSamples(__analogSamples+1);//in samples
+__analogSetClockDiv(__analogClockDiv);
+__analogSetWidth(__analogWidth+9);//in bits
+
+SET_PERI_REG_MASK(SENS_SAR_READ_CTRL_REG, SENS_SAR1_DATA_INV);
+SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
+
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_START_FORCE_M); //SAR ADC1 controller (in RTC) is started by SW
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_SAR1_EN_PAD_FORCE_M); //SAR ADC1 pad enable bitmap is controlled by SW
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_FORCE_M); //SAR ADC2 controller (in RTC) is started by SW
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD_FORCE_M); //SAR ADC2 pad enable bitmap is controlled by SW
+
+CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR_M); //force XPD_SAR=0, use XPD_FSM
+SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_AMP, 0x2, SENS_FORCE_XPD_AMP_S); //force XPD_AMP=0
+
+CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_CTRL_REG, 0xfff << SENS_AMP_RST_FB_FSM_S); //clear FSM
+SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT1_REG, SENS_SAR_AMP_WAIT1, 0x1, SENS_SAR_AMP_WAIT1_S);
+SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT1_REG, SENS_SAR_AMP_WAIT2, 0x1, SENS_SAR_AMP_WAIT2_S);
+SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_SAR_AMP_WAIT3, 0x1, SENS_SAR_AMP_WAIT3_S);
+while (GET_PERI_REG_BITS2(SENS_SAR_SLAVE_ADDR1_REG, 0x7, SENS_MEAS_STATUS_S) !=0); //wait det_fsm==
+
+initialized= true;
+}
+
+uint16_tIRAM_ATTR__analogRead(uint8_tpin)
+{
+int8_tchannel=digitalPinToAnalogChannel(pin);
+if(channel<0){
+return0;//not adc pin
+ }
+int8_tpad=digitalPinToTouchChannel(pin);
+
+if(pad >= 0){
+uint32_ttouch=READ_PERI_REG(SENS_SAR_TOUCH_ENABLE_REG);
+if(touch& (1 << pad)){
+touch &= ~((1 << (pad+SENS_TOUCH_PAD_OUTEN2_S))
+ | (1 << (pad+SENS_TOUCH_PAD_OUTEN1_S))
+ | (1 << (pad+SENS_TOUCH_PAD_WORKEN_S)));
+WRITE_PERI_REG(SENS_SAR_TOUCH_ENABLE_REG, touch);
+ }
+ } elseif(pin==25){
+CLEAR_PERI_REG_MASK(RTC_IO_PAD_DAC1_REG, RTC_IO_PDAC1_XPD_DAC | RTC_IO_PDAC1_DAC_XPD_FORCE);//stop dac1
+ } elseif(pin==26){
+CLEAR_PERI_REG_MASK(RTC_IO_PAD_DAC2_REG, RTC_IO_PDAC2_XPD_DAC | RTC_IO_PDAC2_DAC_XPD_FORCE);//stop dac2
+ }
+
+pinMode(pin, ANALOG);
+
+__analogInit();
+
+if(channel>7){
+channel-=10;
+
+SET_PERI_REG_BITS(SENS_SAR_MEAS_START2_REG, SENS_SAR2_EN_PAD, (1 << channel), SENS_SAR2_EN_PAD_S);
+CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_START_SAR_M);
+while (GET_PERI_REG_MASK(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_DONE_SAR) ==0){}; //read done
+returnGET_PERI_REG_BITS2(SENS_SAR_MEAS_START2_REG, SENS_MEAS2_DATA_SAR, SENS_MEAS2_DATA_SAR_S);
+ }
+
+SET_PERI_REG_BITS(SENS_SAR_MEAS_START1_REG, SENS_SAR1_EN_PAD, (1 << channel), SENS_SAR1_EN_PAD_S);
+CLEAR_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_START_SAR_M);
+SET_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_START_SAR_M);
+while (GET_PERI_REG_MASK(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DONE_SAR) ==0){}; //read done
+returnGET_PERI_REG_BITS2(SENS_SAR_MEAS_START1_REG, SENS_MEAS1_DATA_SAR, SENS_MEAS1_DATA_SAR_S);
+}
+int__hallRead() //hall sensor without LNA
+{
+intSens_Vp0;
+intSens_Vn0;
+intSens_Vp1;
+intSens_Vn1;
+
+pinMode(36, ANALOG);
+pinMode(39, ANALOG);
+SET_PERI_REG_MASK(SENS_SAR_TOUCH_CTRL1_REG, SENS_XPD_HALL_FORCE_M); // hall sens force enable
+SET_PERI_REG_MASK(RTC_IO_HALL_SENS_REG, RTC_IO_XPD_HALL); // xpd hall
+SET_PERI_REG_MASK(SENS_SAR_TOUCH_CTRL1_REG, SENS_HALL_PHASE_FORCE_M); // phase force
+CLEAR_PERI_REG_MASK(RTC_IO_HALL_SENS_REG, RTC_IO_HALL_PHASE); // hall phase
+Sens_Vp0=__analogRead(36);
+Sens_Vn0=__analogRead(39);
+SET_PERI_REG_MASK(RTC_IO_HALL_SENS_REG, RTC_IO_HALL_PHASE);
+Sens_Vp1=__analogRead(36);
+Sens_Vn1=__analogRead(39);
+SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR, 0, SENS_FORCE_XPD_SAR_S);
+CLEAR_PERI_REG_MASK(SENS_SAR_TOUCH_CTRL1_REG, SENS_XPD_HALL_FORCE);
+CLEAR_PERI_REG_MASK(SENS_SAR_TOUCH_CTRL1_REG, SENS_HALL_PHASE_FORCE);
+return (Sens_Vp1-Sens_Vp0) - (Sens_Vn1-Sens_Vn0);
+}
+
+externuint16_tanalogRead(uint8_tpin) __attribute__ ((weak, alias("__analogRead")));
+externvoidanalogSetWidth(uint8_tbits) __attribute__ ((weak, alias("__analogSetWidth")));
+externvoidanalogSetCycles(uint8_tcycles) __attribute__ ((weak, alias("__analogSetCycles")));
+externvoidanalogSetSamples(uint8_tsamples) __attribute__ ((weak, alias("__analogSetSamples")));
+externvoidanalogSetClockDiv(uint8_tclockDiv) __attribute__ ((weak, alias("__analogSetClockDiv")));
+//extern void analogSetAttenuation(uint8_t attenuation) __attribute__ ((weak, alias("__analogSetAttenuation")));
+externinthallRead() __attribute__ ((weak, alias("__hallRead")));

cores/esp32/esp32-hal-adc.h

@@ -0,0 +1,74 @@
+/*
+ Arduino.h - Main include file for the Arduino SDK
+ Copyright (c) 2005-2013 Arduino Team. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndefMAIN_ESP32_HAL_ADC_H_
+#defineMAIN_ESP32_HAL_ADC_H_
+
+#ifdef__cplusplus
+extern"C"{
+#endif
+
+#include"esp32-hal.h"
+
+/*
+ * Get ADC value for pin
+ * */
+uint16_tanalogRead(uint8_tpin);
+
+/*
+ * Sets the sample bits (9 - 12)
+ * */
+voidanalogSetWidth(uint8_tbits);
+
+/*
+ * Set number of cycles per sample
+ * Default is 8 and seems to do well
+ * Range is 1 - 255
+ * */
+voidanalogSetCycles(uint8_tcycles);
+
+/*
+ * Set number of samples in the range.
+ * Default is 1
+ * Range is 1 - 255
+ * This setting splits the range into
+ * "samples" pieces, which could look
+ * like the sensitivity has been multiplied
+ * that many times
+ * */
+voidanalogSetSamples(uint8_tsamples);
+
+/*
+ * Set the divider for the ADC clock.
+ * Default is 1
+ * Range is 1 - 255
+ * */
+voidanalogSetClockDiv(uint8_tclockDiv);
+
+/*
+ * Get value for HALL sensor (without LNA)
+ * connected to pins 36(SVP) and 39(SVN)
+ * */
+inthallRead();
+
+#ifdef__cplusplus
+}
+#endif
+
+#endif/* MAIN_ESP32_HAL_ADC_H_ */

cores/esp32/esp32-hal-dac.c

@@ -0,0 +1,54 @@
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include"esp32-hal-dac.h"
+#include"freertos/FreeRTOS.h"
+#include"freertos/task.h"
+#include"rom/ets_sys.h"
+#include"esp_attr.h"
+#include"esp_intr.h"
+#include"soc/rtc_io_reg.h"
+#include"soc/rtc_cntl_reg.h"
+#include"soc/sens_reg.h"
+
+voidIRAM_ATTR__dacWrite(uint8_tpin, uint8_tvalue)
+{
+if(pin<25||pin>26){
+return;//not dac pin
+ }
+pinMode(pin, ANALOG);
+uint8_tchannel=pin-25;
+
+
+//Disable Tone
+CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_SW_TONE_EN);
+
+if (channel){
+//Disable Channel Tone
+CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL2_REG, SENS_DAC_CW_EN2_M);
+//Set the Dac value
+SET_PERI_REG_BITS(RTC_IO_PAD_DAC2_REG, RTC_IO_PDAC2_DAC, value, RTC_IO_PDAC2_DAC_S); //dac_output
+//Channel output enable
+SET_PERI_REG_MASK(RTC_IO_PAD_DAC2_REG, RTC_IO_PDAC2_XPD_DAC | RTC_IO_PDAC2_DAC_XPD_FORCE);
+ } else{
+//Disable Channel Tone
+CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL2_REG, SENS_DAC_CW_EN1_M);
+//Set the Dac value
+SET_PERI_REG_BITS(RTC_IO_PAD_DAC1_REG, RTC_IO_PDAC1_DAC, value, RTC_IO_PDAC1_DAC_S); //dac_output
+//Channel output enable
+SET_PERI_REG_MASK(RTC_IO_PAD_DAC1_REG, RTC_IO_PDAC1_XPD_DAC | RTC_IO_PDAC1_DAC_XPD_FORCE);
+ }
+}
+
+externvoiddacWrite(uint8_tpin, uint8_tvalue) __attribute__ ((weak, alias("__dacWrite")));

cores/esp32/esp32-hal-dac.h

@@ -0,0 +1,35 @@
+/*
+ Arduino.h - Main include file for the Arduino SDK
+ Copyright (c) 2005-2013 Arduino Team. All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndefMAIN_ESP32_HAL_DAC_H_
+#defineMAIN_ESP32_HAL_DAC_H_
+
+#ifdef__cplusplus
+extern"C"{
+#endif
+
+#include"esp32-hal.h"
+
+voiddacWrite(uint8_tpin, uint8_tvalue);
+
+#ifdef__cplusplus
+}
+#endif
+
+#endif/* MAIN_ESP32_HAL_DAC_H_ */