Parcourir la source

Merge branch 'docs/update_timer_and_readme' into 'master'

docs:fixthe number of general purpose timers for ESP32-C3

Closes DOC-1609

See merge request espressif/esp-idf!14175
Krzysztof Budzynski il y a 4 ans
Parent
commit
458bf36200

+ 11 - 2
docs/en/api-reference/peripherals/timer.rst

@@ -3,12 +3,21 @@ General Purpose Timer
 
 :link_to_translation:`zh_CN:[中文]`
 
-{IDF_TARGET_TIMER_COUNTER_BIT_WIDTH:default="54", esp32="64", esp32s2="64"}
+{IDF_TARGET_TIMER_COUNTER_BIT_WIDTH:default="54", esp32="64", esp32s2="64", esp32c3="54"}
 
 Introduction
 ------------
 
-The {IDF_TARGET_NAME} chip contains two hardware timer groups. Each group has two general-purpose hardware timers. They are all {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH}-bit generic timers based on 16-bit pre-scalers and {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH}-bit up / down counters which are capable of being auto-reloaded.
+.. only:: not esp32c3
+
+    The {IDF_TARGET_NAME} chip contains two hardware timer groups. Each group has two general-purpose hardware timers. 
+
+
+.. only:: esp32c3
+
+    The {IDF_TARGET_NAME} chip contains two hardware timer groups. Each group has one general-purpose hardware timer and one main system watchdog timer.
+
+All general purpose timers are based on 16-bit pre-scalers and {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH}-bit auto-reload-capable up-down counters.
 
 
 Functional Overview

+ 12 - 2
docs/zh_CN/api-reference/peripherals/timer.rst

@@ -3,12 +3,21 @@
 
 :link_to_translation:`en:[English]`
 
-{IDF_TARGET_TIMER_COUNTER_BIT_WIDTH:default="54", esp32="64", esp32s2="64"}
+{IDF_TARGET_TIMER_COUNTER_BIT_WIDTH:default="54", esp32="64", esp32s2="64", esp32c3="54"}
 
 简介
 ----
 
-{IDF_TARGET_NAME} 芯片提供两组硬件定时器,每组包含两个通用硬件定时器。所有定时器均为 {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH} 位通用定时器,包括 16 位预分频器和 {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH} 位自动重载向上/向下计数器。
+.. only:: not esp32c3
+
+    {IDF_TARGET_NAME} 芯片提供两组硬件定时器,每组包含两个通用硬件定时器。
+
+
+.. only:: esp32c3
+
+    {IDF_TARGET_NAME} 芯片提供两组硬件定时器,每组包含一个通用硬件定时器和一个主系统看门狗定时器。
+
+所有通用定时器均基于 16 位预分频器和 {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH} 位可自动重新加载向上/向下计数器。
 
 
 功能概述
@@ -100,6 +109,7 @@
 
 {IDF_TARGET_TIMER_COUNTER_BIT_WIDTH} 位通用硬件定时器示例::example:`peripherals/timer_group`。
 
+
 API 参考
 --------