Skip to content

Commit

Permalink
rename periphery to peripheral (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
AsiiaPine authored Sep 10, 2024
1 parent 4153a6e commit a4d2c32
Show file tree
Hide file tree
Showing 48 changed files with 46 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion Src/applications/dronecan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
10 changes: 5 additions & 5 deletions Src/common/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Src/drivers/as5600/as5600.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "as5600.hpp"
#include <array>
#include "periphery/i2c/i2c.hpp"
#include "peripheral/i2c/i2c.hpp"

namespace Driver {

Expand Down
2 changes: 1 addition & 1 deletion Src/drivers/mpu9250/mpu9250.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions Src/drivers/sht3x/sht3x.cpp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/modules/circuit_status/cyphal/circuit_status.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/modules/circuit_status/dronecan/circuit_status.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include "circuit_status.hpp"
#include "periphery/adc/circuit_periphery.hpp"
#include "peripheral/adc/circuit_periphery.hpp"

REGISTER_MODULE(DronecanCircuitStatus)

Expand Down
2 changes: 1 addition & 1 deletion Src/modules/cyphal/core/cyphal_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Src/modules/cyphal/feedback/feedback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Src/modules/cyphal/setpoint/setpoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Src/modules/dronecan/core/dronecan_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Src/modules/dronecan/pwm/PWMModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/modules/dronecan/pwm/PWMModule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Src/periphery/adc/adc.hpp → Src/peripheral/adc/adc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Src/platform/stm32/i2c/i2c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/i2c/i2c.hpp"
#include "peripheral/i2c/i2c.hpp"
#include <array>
#include "i2c.h"

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32/pwm/pwm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <stdint.h>
#include <array>
#include "periphery/pwm/pwm.hpp"
#include "peripheral/pwm/pwm.hpp"
#include "main.h"

namespace HAL {
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/adc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/iwdg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/led.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/led/led.hpp"
#include "peripheral/led/led.hpp"
#include <cstddef>
#include "main.h"

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/pwm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/temperature_sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32f103/uart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/uart/uart.hpp"
#include "peripheral/uart/uart.hpp"
#include "main.h"
2 changes: 1 addition & 1 deletion Src/platform/stm32g0b1/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32g0b1/gpio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*LICENSE.
***/

#include "periphery/gpio/gpio.hpp"
#include "peripheral/gpio/gpio.hpp"

#include "main.h"

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32g0b1/pwm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/stm32g0b1/spi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/adc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/gpio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*LICENSE.
***/

#include "periphery/gpio/gpio.hpp"
#include "peripheral/gpio/gpio.hpp"

#include <vector>
#include "main.h"
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/i2c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/i2c/i2c.hpp"
#include "peripheral/i2c/i2c.hpp"
#include "main.h"
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/iwdg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/iwdg/iwdg.hpp"
#include "peripheral/iwdg/iwdg.hpp"

void WatchdogPeriphery::refresh() {
// do nothing
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/led.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/led/led.hpp"
#include "peripheral/led/led.hpp"

namespace Board {

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/pwm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/pwm/pwm.hpp"
#include "peripheral/pwm/pwm.hpp"

namespace HAL {

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/spi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/spi/spi.hpp"
#include "peripheral/spi/spi.hpp"
#include <cstring>
#include "main.h"

Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/temperature_sensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Src/platform/ubuntu/uart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* Author: Dmitry Ponomarev <[email protected]>
*/

#include "periphery/uart/uart.hpp"
#include "peripheral/uart/uart.hpp"
#include "main.h"

0 comments on commit a4d2c32

Please sign in to comment.