Просмотр исходного кода

Merge branch 'bugfix/pcnt_driver' into 'master'

Fixing some syntax errors in pcnt



See merge request !278

Ivan Grokhotkov 9 лет назад
Родитель
Сommit
a1542421c0
2 измененных файлов с 5 добавлено и 5 удалено
  1. 3 3
      components/driver/include/driver/pcnt.h
  2. 2 2
      components/driver/pcnt.c

+ 3 - 3
components/driver/include/driver/pcnt.h

@@ -27,9 +27,9 @@ typedef enum {
 } pcnt_ctrl_mode_t;
 
 typedef enum {
-    PCNT_COUNT_DIS = 0,            /*!< Counter mode: Decrease counter value*/
+    PCNT_COUNT_DIS = 0,            /*!< Counter mode: Inhibit counter(counter value will not change in this condition)*/
     PCNT_COUNT_INC = 1,            /*!< Counter mode: Increase counter value*/
-    PCNT_COUNT_DEC = 2,            /*!< Counter mode: Inhibit counter(counter value will not change in this condition)*/
+    PCNT_COUNT_DEC = 2,            /*!< Counter mode: Decrease counter value*/
     PCNT_COUNT_MAX
 } pcnt_count_mode_t;
 
@@ -45,7 +45,7 @@ typedef enum {
     PCNT_UNIT_MAX,
 } pcnt_unit_t; 
 
-typedef enum{
+typedef enum {
     PCNT_CHANNEL_0 = 0x00,           /*!< PCNT channel0 */
     PCNT_CHANNEL_1 = 0x01,           /*!< PCNT channel1 */
     PCNT_CHANNEL_MAX,

+ 2 - 2
components/driver/pcnt.c

@@ -38,8 +38,8 @@ static portMUX_TYPE pcnt_spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 esp_err_t pcnt_unit_config(pcnt_config_t *pcnt_config)
 {
-    uint8_t unit = pcnt_config->channel;
-    uint8_t channel = pcnt_config->unit;
+    uint8_t unit = pcnt_config->unit;
+    uint8_t channel = pcnt_config->channel;
     int input_io = pcnt_config->pulse_gpio_num;
     int ctrl_io = pcnt_config->ctrl_gpio_num;