Skip to content

Commit d97e118

Browse files
committed
Merge branch 'edge' into vacuum-module-add-pressure-control-task
2 parents 527ca40 + aeaf9a0 commit d97e118

File tree

6 files changed

+3
-9
lines changed

6 files changed

+3
-9
lines changed

stm32-modules/include/vacuum-module/firmware/pump_hardware.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern "C" {
88
void pump_hardware_init(void);
99
bool hw_start_pump_motor();
1010
bool hw_stop_pump_motor();
11-
void hw_set_pump_duty_cycle(int16_t duty);
11+
void hw_set_pump_duty_cycle(uint16_t duty);
1212
uint16_t hw_get_pump_duty_cycle(void);
1313
bool hw_enable_pump_tach(bool enable);
1414
float hw_get_pump_rpm(void);

stm32-modules/vacuum-module/firmware/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ set(VENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vent")
1616
set(PUMP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/pump")
1717
set(ATMOSPHERE_PS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/atmosphere-pressure-sensor")
1818
set(VACUUM_PS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vacuum-pressure-sensor")
19-
set(CONTROL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/control_task")
2019

2120
# Add source files that should be checked by clang-tidy here
2221
set(${TARGET_MODULE_NAME}_FW_LINTABLE_SRCS

stm32-modules/vacuum-module/firmware/pump/pump_hardware.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ bool hw_stop_pump_motor() {
177177
return HAL_TIM_PWM_Stop(&htim17, TIM_CHANNEL_1) == HAL_OK;
178178
}
179179

180-
void hw_set_pump_duty_cycle(int16_t duty) {
180+
void hw_set_pump_duty_cycle(uint16_t duty) {
181181
duty = clamp(duty, 0, 100);
182182
uint16_t ccr = (uint16_t)(((float)duty / 100.0f) * (PWM_PERIOD + 1));
183183
TIM17->CCR1 = ccr;

stm32-modules/vacuum-module/firmware/pump/pump_policy.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include "FreeRTOS.h"
66
#include "firmware/pump_hardware.h"
7-
#include "projdefs.h"
87
#include "task.h"
98

109
using namespace pump_policy;

stm32-modules/vacuum-module/firmware/ui/ui_policy.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "firmware/ui_policy.hpp"
22

33
#include "FreeRTOS.h"
4+
#include "firmware/pump_hardware.h"
45
#include "firmware/ui_hardware.h"
56
#include "task.h"
67

stm32-modules/vacuum-module/firmware/vent/vent_policy.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#include "firmware/vent_policy.hpp"
22

3-
#include <cstdint>
4-
5-
#include "FreeRTOS.h"
63
#include "firmware/vent_hardware.h"
7-
#include "projdefs.h"
8-
#include "task.h"
94

105
using namespace vent_policy;
116

0 commit comments

Comments
 (0)