Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ulp_fixes' into 'master'

Browse source 
Minor fixes for ULP

See merge request !800
This commit is contained in:
Ivan Grokhotkov 2017-06-14 09:12:55 +08:00
commit af1bec4625
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/api-guides/ulp_instruction_set.rst
View file

@ -651,21 +651,21 @@ Similar considerations apply to ``LD`` and ``ST`` instructions. Consider the fol
--------------------------------- ---------------------------------
**Syntax** **Syntax**
**ADC** *Rdst, Sar_sel, Mux, Cycles* - **ADC** *Rdst, Sar_sel, Mux*
- **ADC** *Rdst, Sar_sel, Mux, 0* — deprecated form
**Operands** **Operands**
- *Rdst* – Destination Register R[0..3], result will be stored to this register - *Rdst* – Destination Register R[0..3], result will be stored to this register
- *Sar_sel* – selected ADC : 0=SARADC0, 1=SARADC1 - *Sar_sel* – Select ADC: 0 = SARADC1, 1 = SARADC2
- *Mux* - selected PAD, SARADC Pad[Mux+1] is enabled - *Mux* - selected PAD, SARADC Pad[Mux+1] is enabled
- *Cycle* – number of cycles used to perform measurement
**Description** **Description**
The instruction makes measurements from ADC. The instruction makes measurements from ADC.
**Examples**:: **Examples**::
1: ADC R1, 0, 1, 100 // Measure value using ADC1 pad 2, 1: ADC R1, 0, 1 // Measure value using ADC1 pad 2 and store result into R1
// for 100 cycles and move result to R1
**REG_RD** – read from peripheral register **REG_RD** – read from peripheral register
@ -740,7 +740,7 @@ READ_RTC_FIELD(rtc_reg, field)
#include "soc/sens_reg.h" #include "soc/sens_reg.h"
/* Read 8-bit SENS_TSENS_OUT field of SENS_SAR_SLAVE_ADDR3_REG into R0 */ /* Read 8-bit SENS_TSENS_OUT field of SENS_SAR_SLAVE_ADDR3_REG into R0 */
READ_RTC_REG(SENS_SAR_SLAVE_ADDR3_REG, SENS_TSENS_OUT) READ_RTC_FIELD(SENS_SAR_SLAVE_ADDR3_REG, SENS_TSENS_OUT)
WRITE_RTC_REG(rtc_reg, low_bit, bit_width, value) WRITE_RTC_REG(rtc_reg, low_bit, bit_width, value)
Write immediate value into rtc_reg[low_bit + bit_width - 1 : low_bit], bit_width <= 8. For example:: Write immediate value into rtc_reg[low_bit + bit_width - 1 : low_bit], bit_width <= 8. For example::
@ -759,7 +759,7 @@ WRITE_RTC_FIELD(rtc_reg, field, value)
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
/* Set RTC_CNTL_ULP_CP_SLP_TIMER_EN field of RTC_CNTL_STATE0_REG to 0 */ /* Set RTC_CNTL_ULP_CP_SLP_TIMER_EN field of RTC_CNTL_STATE0_REG to 0 */
READ_RTC_REG(RTC_CNTL_STATE0_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN, 0) WRITE_RTC_FIELD(RTC_CNTL_STATE0_REG, RTC_CNTL_ULP_CP_SLP_TIMER_EN, 0)

2
examples/system/ulp_adc/main/ulp/adc.S
View file

@ -72,7 +72,7 @@ entry:
stage_rst stage_rst
measure: measure:
/* measure and add value to accumulator */ /* measure and add value to accumulator */
adc r1, 0, adc_channel + 1, 0 adc r1, 0, adc_channel + 1
add r0, r0, r1 add r0, r0, r1
/* increment loop counter and check exit condition */ /* increment loop counter and check exit condition */
stage_inc 1 stage_inc 1