RaccoonlabDev · PonomarevDA · Sep 10, 2024 · Sep 6, 2024 · Sep 10, 2024
diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -17,4 +17,4 @@ jobs:
       - run: pip3 install cpplint
       - name: cpplint
         run: |
-          cpplint Src/modules/*/*pp Src/periphery/*/*pp Src/platform/*/*pp
+          cpplint Src/modules/*/*pp Src/peripheral/*/*pp Src/platform/*/*pp
diff --git a/Src/applications/dronecan/README.md b/Src/applications/dronecan/README.md
@@ -34,4 +34,3 @@ The node has the following registers:
 |  30 | imu.enable              | Enable or disable IMU publisher. |
 
 > This docs was automatically generated. Do not edit it manually.
-
diff --git a/Src/common/application.cpp b/Src/common/application.cpp
@@ -7,15 +7,15 @@
 #include "application.hpp"
 #include <array>
 #include <bitset>
-#include "periphery/adc/circuit_periphery.hpp"
-#include "periphery/led/led.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
+#include "peripheral/led/led.hpp"
 #include "params.hpp"
 #include "module.hpp"
 #include "main.h"
 
-#include "periphery/led/led.hpp"
-#include "periphery/gpio/gpio.hpp"
-#include "periphery/iwdg/iwdg.hpp"
+#include "peripheral/led/led.hpp"
+#include "peripheral/gpio/gpio.hpp"
+#include "peripheral/iwdg/iwdg.hpp"
 
 static int8_t init_board_periphery() {
     Board::Led::reset();

diff --git a/Src/drivers/as5600/as5600.cpp b/Src/drivers/as5600/as5600.cpp
@@ -7,7 +7,7 @@
 
 #include "as5600.hpp"
 #include <array>
-#include "periphery/i2c/i2c.hpp"
+#include "peripheral/i2c/i2c.hpp"
 
 namespace Driver {
 

diff --git a/Src/drivers/mpu9250/mpu9250.cpp b/Src/drivers/mpu9250/mpu9250.cpp
@@ -6,7 +6,7 @@
 
 #include "mpu9250.hpp"
 #include <cstddef>
-#include "periphery/spi/spi.hpp"
+#include "peripheral/spi/spi.hpp"
 
 // Register Map for Gyroscope and Accelerometer
 enum class Mpu9250Resgiter : uint8_t {

diff --git a/Src/drivers/sht3x/sht3x.cpp b/Src/drivers/sht3x/sht3x.cpp
@@ -1,9 +1,9 @@
-#include "periphery/sht3x/sht3x.hpp"
+#include "peripheral/sht3x/sht3x.hpp"
 
 #include <cstdint>
 
 #include "main.h"
-#include "periphery/i2c/i2c.hpp"
+#include "peripheral/i2c/i2c.hpp"
 
 static uint16_t uint8_to_uint16(uint8_t msb, uint8_t lsb) {
     return (uint16_t)((uint16_t)msb << 8u) | lsb;

diff --git a/Src/modules/circuit_status/cyphal/circuit_status.hpp b/Src/modules/circuit_status/cyphal/circuit_status.hpp
@@ -9,7 +9,7 @@
 
 #include "cyphal_publishers.hpp"
 #include "Udral/circuit_status.hpp"
-#include "periphery/adc/circuit_periphery.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
 #include "module.hpp"
 
 #ifdef __cplusplus

diff --git a/Src/modules/circuit_status/dronecan/circuit_status.cpp b/Src/modules/circuit_status/dronecan/circuit_status.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "circuit_status.hpp"
-#include "periphery/adc/circuit_periphery.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
 
 REGISTER_MODULE(DronecanCircuitStatus)
 

diff --git a/Src/modules/cyphal/core/cyphal_module.cpp b/Src/modules/cyphal/core/cyphal_module.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include "cyphal.hpp"
 #include "params.hpp"
-#include "periphery/adc/circuit_periphery.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
 
 REGISTER_MODULE(CyphalModule)
 

diff --git a/Src/modules/cyphal/feedback/feedback.cpp b/Src/modules/cyphal/feedback/feedback.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include "cyphal.hpp"
 #include "params.hpp"
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 
 REGISTER_MODULE(FeedbackModule)
 

diff --git a/Src/modules/cyphal/setpoint/setpoint.cpp b/Src/modules/cyphal/setpoint/setpoint.cpp
@@ -9,7 +9,7 @@
 #include "reg/udral/service/actuator/common/sp/Vector31_0_1.h"
 #include "cyphal.hpp"
 #include "params.hpp"
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 
 REGISTER_MODULE(SetpointModule)
 

diff --git a/Src/modules/dronecan/core/dronecan_module.cpp b/Src/modules/dronecan/core/dronecan_module.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include "params.hpp"
 #include "dronecan.h"
-#include "periphery/adc/circuit_periphery.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
 
 REGISTER_MODULE(DronecanModule)
 

diff --git a/Src/modules/dronecan/pwm/PWMModule.cpp b/Src/modules/dronecan/pwm/PWMModule.cpp
@@ -14,7 +14,7 @@
 #include "uavcan/equipment/esc/Status.h"
 #include "uavcan/equipment/actuator/ArrayCommand.h"
 #include "uavcan/equipment/actuator/Status.h"
-#include "periphery/adc/circuit_periphery.hpp"
+#include "peripheral/adc/circuit_periphery.hpp"
 #include "common/algorithms.hpp"
 
 #define CH(channel) IntParamsIndexes::PARAM_PWM_##channel##_CH

diff --git a/Src/modules/dronecan/pwm/PWMModule.hpp b/Src/modules/dronecan/pwm/PWMModule.hpp
@@ -13,7 +13,7 @@
 #include "dronecan.h"
 #include "params.hpp"
 #include "logger.hpp"
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 #include "common/module.hpp"
 #include "publisher.hpp"
 #include "subscriber.hpp"

diff --git a/Src/periphery/adc/adc.hpp → Src/peripheral/adc/adc.hpp b/Src/periphery/adc/adc.hpp → Src/peripheral/adc/adc.hpp
@@ -5,7 +5,7 @@
 #define SRC_PERIPHERY_ADC_ADC_HPP_
 
 #include <stdint.h>
-#include "periphery/temperature_sensor/temperature_sensor.hpp"
+#include "peripheral/temperature_sensor/temperature_sensor.hpp"
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/Src/periphery/adc/circuit_periphery.cpp → Src/peripheral/adc/circuit_periphery.cpp b/Src/periphery/adc/circuit_periphery.cpp → Src/peripheral/adc/circuit_periphery.cpp
@@ -9,8 +9,8 @@
 #include "application.hpp"
 #include "main.h"
 #include "params.hpp"
-#include "periphery/led/led.hpp"
-#include "periphery/iwdg/iwdg.hpp"
+#include "peripheral/led/led.hpp"
+#include "peripheral/iwdg/iwdg.hpp"
 
 static const std::array<std::pair<uint16_t, uint16_t>, (int)BoardType::BOARDS_AMOUNT> hw_info = {{
     {59, 69},

diff --git a/Src/periphery/adc/circuit_periphery.hpp → Src/peripheral/adc/circuit_periphery.hpp b/Src/periphery/adc/circuit_periphery.hpp → Src/peripheral/adc/circuit_periphery.hpp
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <limits>
 #include <utility>
-#include "periphery/temperature_sensor/temperature_sensor.hpp"
-#include "periphery/adc/adc.hpp"
+#include "peripheral/temperature_sensor/temperature_sensor.hpp"
+#include "peripheral/adc/adc.hpp"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/Src/periphery/gpio/gpio.hpp → Src/peripheral/gpio/gpio.hpp b/Src/periphery/gpio/gpio.hpp → Src/peripheral/gpio/gpio.hpp
diff --git a/Src/periphery/i2c/i2c.hpp → Src/peripheral/i2c/i2c.hpp b/Src/periphery/i2c/i2c.hpp → Src/peripheral/i2c/i2c.hpp
diff --git a/Src/periphery/iwdg/iwdg.hpp → Src/peripheral/iwdg/iwdg.hpp b/Src/periphery/iwdg/iwdg.hpp → Src/peripheral/iwdg/iwdg.hpp
diff --git a/Src/periphery/led/led.hpp → Src/peripheral/led/led.hpp b/Src/periphery/led/led.hpp → Src/peripheral/led/led.hpp
diff --git a/Src/periphery/pwm/pwm.hpp → Src/peripheral/pwm/pwm.hpp b/Src/periphery/pwm/pwm.hpp → Src/peripheral/pwm/pwm.hpp
diff --git a/Src/periphery/spi/spi.hpp → Src/peripheral/spi/spi.hpp b/Src/periphery/spi/spi.hpp → Src/peripheral/spi/spi.hpp
diff --git a/...temperature_sensor/temperature_sensor.hpp → ...temperature_sensor/temperature_sensor.hpp b/...temperature_sensor/temperature_sensor.hpp → ...temperature_sensor/temperature_sensor.hpp
diff --git a/Src/periphery/uart/uart.hpp → Src/peripheral/uart/uart.hpp b/Src/periphery/uart/uart.hpp → Src/peripheral/uart/uart.hpp
diff --git a/Src/platform/stm32/i2c/i2c.cpp b/Src/platform/stm32/i2c/i2c.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/i2c/i2c.hpp"
+#include "peripheral/i2c/i2c.hpp"
 #include <array>
 #include "i2c.h"
 

diff --git a/Src/platform/stm32/pwm/pwm.hpp b/Src/platform/stm32/pwm/pwm.hpp
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 #include <array>
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 #include "main.h"
 
 namespace HAL {

diff --git a/Src/platform/stm32f103/CMakeLists.txt b/Src/platform/stm32f103/CMakeLists.txt
@@ -9,7 +9,7 @@ add_executable(${EXECUTABLE}
     ${ROOT_DIR}/Src/common/application.cpp
     ${ROOT_DIR}/Src/common/module.cpp
 
-    ${ROOT_DIR}/Src/periphery/adc/circuit_periphery.cpp
+    ${ROOT_DIR}/Src/peripheral/adc/circuit_periphery.cpp
     ${CMAKE_CURRENT_LIST_DIR}/adc.cpp
     ${ROOT_DIR}/Src/platform/stm32/pwm/pwm.cpp
     ${CMAKE_CURRENT_LIST_DIR}/pwm.cpp

diff --git a/Src/platform/stm32f103/adc.cpp b/Src/platform/stm32f103/adc.cpp
@@ -3,7 +3,7 @@
  *  Distributed under the terms of the GPL v3 license, available in the file LICENSE.
 ***/ 
 
-#include "periphery/adc/adc.hpp"
+#include "peripheral/adc/adc.hpp"
 #include "main.h"
 
 extern ADC_HandleTypeDef hadc1;

diff --git a/Src/platform/stm32f103/iwdg.cpp b/Src/platform/stm32f103/iwdg.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/iwdg/iwdg.hpp"
+#include "peripheral/iwdg/iwdg.hpp"
 #include "main.h"
 
 #ifdef HAL_IWDG_MODULE_ENABLED

diff --git a/Src/platform/stm32f103/led.cpp b/Src/platform/stm32f103/led.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/led/led.hpp"
+#include "peripheral/led/led.hpp"
 #include <cstddef>
 #include "main.h"
 

diff --git a/Src/platform/stm32f103/pwm.cpp b/Src/platform/stm32f103/pwm.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 #include "platform/stm32/pwm/pwm.hpp"
 
 extern TIM_HandleTypeDef htim3;

diff --git a/Src/platform/stm32f103/temperature_sensor.cpp b/Src/platform/stm32f103/temperature_sensor.cpp
@@ -16,7 +16,7 @@
  * stm32g0      30              0.76        2.5
  */
 
-#include "periphery/temperature_sensor/temperature_sensor.hpp"
+#include "peripheral/temperature_sensor/temperature_sensor.hpp"
 
 #ifdef STM32G0B1xx
     static const uint16_t TEMP_REF = 30;

diff --git a/Src/platform/stm32f103/uart.cpp b/Src/platform/stm32f103/uart.cpp
@@ -4,5 +4,5 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/uart/uart.hpp"
+#include "peripheral/uart/uart.hpp"
 #include "main.h"
diff --git a/Src/platform/stm32g0b1/CMakeLists.txt b/Src/platform/stm32g0b1/CMakeLists.txt
@@ -14,7 +14,7 @@ add_executable(${EXECUTABLE}
     ${ROOT_DIR}/Src/common/application.cpp
     ${ROOT_DIR}/Src/common/module.cpp
 
-    ${ROOT_DIR}/Src/periphery/adc/circuit_periphery.cpp
+    ${ROOT_DIR}/Src/peripheral/adc/circuit_periphery.cpp
     ${ROOT_DIR}/Src/platform/stm32/pwm/pwm.cpp
     ${PLATFORM_DIR}/stm32f103/adc.cpp
     ${CMAKE_CURRENT_LIST_DIR}/gpio.cpp

diff --git a/Src/platform/stm32g0b1/gpio.cpp b/Src/platform/stm32g0b1/gpio.cpp
@@ -4,7 +4,7 @@
  *LICENSE.
  ***/
 
-#include "periphery/gpio/gpio.hpp"
+#include "peripheral/gpio/gpio.hpp"
 
 #include "main.h"
 

diff --git a/Src/platform/stm32g0b1/pwm.cpp b/Src/platform/stm32g0b1/pwm.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 #include "platform/stm32/pwm/pwm.hpp"
 
 extern TIM_HandleTypeDef htim4;

diff --git a/Src/platform/stm32g0b1/spi.cpp b/Src/platform/stm32g0b1/spi.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/spi/spi.hpp"
+#include "peripheral/spi/spi.hpp"
 #include <array>
 #include <cstring>
 #include "main.h"

diff --git a/Src/platform/ubuntu/CMakeLists.txt b/Src/platform/ubuntu/CMakeLists.txt
@@ -9,7 +9,7 @@ add_executable(${EXECUTABLE}
     ${ROOT_DIR}/Src/common/application.cpp
     ${ROOT_DIR}/Src/common/module.cpp
 
-    ${ROOT_DIR}/Src/periphery/adc/circuit_periphery.cpp
+    ${ROOT_DIR}/Src/peripheral/adc/circuit_periphery.cpp
     ${CMAKE_CURRENT_LIST_DIR}/adc.cpp
     ${CMAKE_CURRENT_LIST_DIR}/gpio.cpp
     ${CMAKE_CURRENT_LIST_DIR}/pwm.cpp

diff --git a/Src/platform/ubuntu/adc.cpp b/Src/platform/ubuntu/adc.cpp
@@ -3,7 +3,7 @@
  *  Distributed under the terms of the GPL v3 license, available in the file LICENSE.
 ***/ 
 
-#include "periphery/adc/adc.hpp"
+#include "peripheral/adc/adc.hpp"
 
 struct adcState {
     uint16_t current;

diff --git a/Src/platform/ubuntu/gpio.cpp b/Src/platform/ubuntu/gpio.cpp
@@ -4,7 +4,7 @@
  *LICENSE.
  ***/
 
-#include "periphery/gpio/gpio.hpp"
+#include "peripheral/gpio/gpio.hpp"
 
 #include <vector>
 #include "main.h"

diff --git a/Src/platform/ubuntu/i2c.cpp b/Src/platform/ubuntu/i2c.cpp
@@ -4,5 +4,5 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/i2c/i2c.hpp"
+#include "peripheral/i2c/i2c.hpp"
 #include "main.h"
diff --git a/Src/platform/ubuntu/iwdg.cpp b/Src/platform/ubuntu/iwdg.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/iwdg/iwdg.hpp"
+#include "peripheral/iwdg/iwdg.hpp"
 
 void WatchdogPeriphery::refresh() {
     // do nothing

diff --git a/Src/platform/ubuntu/led.cpp b/Src/platform/ubuntu/led.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/led/led.hpp"
+#include "peripheral/led/led.hpp"
 
 namespace Board {
 

diff --git a/Src/platform/ubuntu/pwm.cpp b/Src/platform/ubuntu/pwm.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/pwm/pwm.hpp"
+#include "peripheral/pwm/pwm.hpp"
 
 namespace HAL {
 

diff --git a/Src/platform/ubuntu/spi.cpp b/Src/platform/ubuntu/spi.cpp
@@ -4,7 +4,7 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/spi/spi.hpp"
+#include "peripheral/spi/spi.hpp"
 #include <cstring>
 #include "main.h"
 

diff --git a/Src/platform/ubuntu/temperature_sensor.cpp b/Src/platform/ubuntu/temperature_sensor.cpp
@@ -16,7 +16,7 @@
  * stm32g0      30              0.76        2.5
  */
 
-#include "periphery/temperature_sensor/temperature_sensor.hpp"
+#include "peripheral/temperature_sensor/temperature_sensor.hpp"
 
 #ifdef STM32G0B1xx
     static const uint16_t TEMP_REF = 30;

diff --git a/Src/platform/ubuntu/uart.cpp b/Src/platform/ubuntu/uart.cpp
@@ -4,5 +4,5 @@
  * Author: Dmitry Ponomarev <[email protected]>
  */
 
-#include "periphery/uart/uart.hpp"
+#include "peripheral/uart/uart.hpp"
 #include "main.h"