Skip to content

Commit 8ce92e0

Browse files
committed
restructured imports
1 parent a1bd20e commit 8ce92e0

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

src/current_sense/hardware_specific/esp32/esp32_adc_driver.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#include "esp32_adc_driver.h"
21

3-
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32)
42
#include "esp32_mcu.h"
3+
#include "esp32_adc_driver.h"
54

5+
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32)
66
#define SIMPLEFOC_ADC_ATTEN ADC_11db
77
#define SIMPLEFOC_ADC_RES 12
88

@@ -138,6 +138,8 @@ uint16_t IRAM_ATTR adcRead(uint8_t pin)
138138

139139
#else // if others just use analogRead
140140

141+
#pragma message("SimpleFOC: Using analogRead for ADC reading, no fast ADC configuration available!")
142+
141143
uint16_t IRAM_ATTR adcRead(uint8_t pin){
142144
return analogRead(pin);
143145
}

src/current_sense/hardware_specific/esp32/esp32_adc_driver.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef SIMPLEFOC_ESP32_HAL_ADC_DRIVER_H_
22
#define SIMPLEFOC_ESP32_HAL_ADC_DRIVER_H_
33

4-
#include "Arduino.h"
5-
64
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32) && defined(SOC_MCPWM_SUPPORTED) && !defined(SIMPLEFOC_ESP32_USELEDC)
75

86
/**

src/current_sense/hardware_specific/esp32/esp32_mcpwm_mcu.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include "../../hardware_api.h"
2-
#include "../../../drivers/hardware_api.h"
1+
#include "esp32_mcu.h"
32

43
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32) && defined(SOC_MCPWM_SUPPORTED) && !defined(SIMPLEFOC_ESP32_USELEDC)
54

@@ -10,7 +9,6 @@
109
#error SimpleFOC: ESP-IDF version 4 or lower detected. Please update to ESP-IDF 5.x and Arduino-esp32 3.0 (or higher)
1110
#endif
1211

13-
#include "esp32_mcu.cpp"
1412
#include "../../../drivers/hardware_specific/esp32/esp32_driver_mcpwm.h"
1513
#include "../../../drivers/hardware_specific/esp32/mcpwm_private.h"
1614

src/current_sense/hardware_specific/esp32/esp32_mcu.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
#include "../../hardware_api.h"
2-
#include "../../../drivers/hardware_api.h"
3-
4-
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32)
5-
6-
#include "esp32_adc_driver.h"
71
#include "esp32_mcu.h"
82

3+
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32)
94

105
/**
116
* Inline adc reading implementation

src/current_sense/hardware_specific/esp32/esp32_mcu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#ifndef ESP32_MCU_CURRENT_SENSING_H
22
#define ESP32_MCU_CURRENT_SENSING_H
33

4+
#include "../../hardware_api.h"
45

56
#if defined(ESP_H) && defined(ARDUINO_ARCH_ESP32)
67

7-
#include "../../hardware_api.h"
8-
#include "../../../drivers/hardware_api.h"
98

9+
#include "../../../drivers/hardware_api.h"
1010
#include "esp32_adc_driver.h"
1111

1212

0 commit comments

Comments
 (0)