Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
53312fd
sys/parameter_handler: return optional for multi-board CAN
gdoffe Feb 8, 2026
df293cd
motion_control: add new_target flag and improve debug traces
gdoffe Feb 9, 2026
0b3198d
lib/actuator/motor: add DUALPID_TRACKER control mode
gdoffe Feb 9, 2026
3faba5e
platforms/pf-robot-motors: add tracker chain modules
gdoffe Feb 9, 2026
751a472
applications/robot-lift-control: add multi-lift application
gdoffe Feb 9, 2026
0927e9e
motion_control/engines/motor_engine: clear overload pin each period
gdoffe Feb 9, 2026
94781ae
platforms: fix printf format for uuid on native
gdoffe Mar 11, 2026
4d797b1
lib/actuator/lift: simplify init to calibrate lower limit
Feb 21, 2026
55c949c
motion_control/engines/motor_engine: hold position on timeout
Feb 21, 2026
b1ce3d9
lib/actuator/lift: disable timeout on limit switch hit
Feb 21, 2026
5e19e67
applications/robot-lift-control: run init sequence at boot
Feb 21, 2026
fcd4d62
motion_control/engines/motor_engine: log pose_reached transitions
gdoffe Mar 14, 2026
a86c704
lib/actuator/lift: skip redundant actuate calls
gdoffe Mar 29, 2026
a7e5098
platforms/pf-common: centralize emergency stop CAN handling
gdoffe Mar 30, 2026
06592a9
lib/actuator/motor: add anti-blocking detection
gdoffe Mar 30, 2026
a0a8645
build: disable top-level parallel builds
gdoffe Mar 30, 2026
b078f4c
platforms/pf-common: call EMS callback only on rising edge
gdoffe Mar 30, 2026
bb9067d
platforms/pf-common: latch emergency stop until game_reset
gdoffe Mar 30, 2026
1d3a107
platforms/pf-robot-motors: reject commands while EMS latched
gdoffe Mar 30, 2026
21fe020
lib/actuator/motor: report blocked and timeout state via CAN
gdoffe Mar 30, 2026
1131673
lib/actuator/lift: reset last command on blocked or timeout
gdoffe Mar 30, 2026
daea116
applications/robot-motion-control: lower linear acceleration
gdoffe Apr 2, 2026
36837c2
lib/actuator/lift: brake on upper limit switch
gdoffe Apr 2, 2026
6e57a33
pose_straight_filter: log state transitions once
gdoffe Apr 2, 2026
6dfedba
applications/robot-lift-control: tune lift PID and speed
gdoffe Apr 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ boards := $(foreach dir,$(wildcard boards/*),$(subst boards/, , $(dir)))
# RIOT-OS patches targets
include $(MCUFIRMWAREBASE)/makefiles/riot-patches.mk.inc

# Disable top-level parallelism to avoid race conditions on shared resources
# (packages, kconfiglib). Each application is already built with -j$(nproc).
.NOTPARALLEL:

.PHONY: all clean distclean doc docman doclatex docclean help world
.PHONY: distclean-riot-patches riot-patches
.PHONY: $(apps) $(examples)
Expand Down
240 changes: 0 additions & 240 deletions applications/cup2025-robot1-lift/include/app_conf.hpp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
APPLICATION = cup2025-robot1-lift
APPLICATION = robot-lift-control

BOARD ?= cogip-board

# Lift identifier (1-5)
LIFT_ID ?= 1
CFLAGS += -DLIFT_ID=$(LIFT_ID)

# Platform
USEMODULE += pf-robot-motors

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ namespace app {

void app_init(void)
{
cogip::pf::actuators::positional_actuators::create_lift(cogip::actuators::Enum::MOTOR_LIFT,
cogip::pf::actuators::positional_actuators::create_lift(actuators::LIFT_ACTUATOR_ID,
actuators::lift_params);
cogip::pf::actuators::positional_actuators::init_sequence();
}

} // namespace app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static const motor_driver_params_t actuators_motors_params = {
.gpio_enable = GPIO_PIN(PORT_A, 10),
.gpio_dir0 = GPIO_PIN(PORT_C, 6),
.gpio_brake = GPIO_PIN(PORT_C, 8),
.gpio_dir_reverse = 1,
.gpio_dir_reverse = 0,
},
},
.motor_set_post_cb = nullptr};
Expand Down
18 changes: 18 additions & 0 deletions applications/robot-lift-control/include/app_conf.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#pragma once

// Macro helpers for LIFT_ID → liftX_conf.hpp include
#define STRINGIFY(x) #x
#define EXPAND_AND_STRINGIFY(x) STRINGIFY(x)
#define CONCATENATE3(a, b, c) a##b##c
#define LIFT_CONF_FILE(id) CONCATENATE3(lift, id, _conf.hpp)

#ifndef LIFT_ID
#error "Build with LIFT_ID=<1-2>. Ex: make LIFT_ID=1"
#endif

#if LIFT_ID < 1 || LIFT_ID > 2
#error "LIFT_ID must be 1 or 2"
#endif

// Include the appropriate lift configuration based on LIFT_ID
#include EXPAND_AND_STRINGIFY(LIFT_CONF_FILE(LIFT_ID))
18 changes: 18 additions & 0 deletions applications/robot-lift-control/include/lift1_conf.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#pragma once

#include "lift_common_conf.hpp"

namespace cogip {
namespace app {
namespace actuators {

/// @brief Lift 1 actuator ID (for CAN protobuf messages)
inline constexpr cogip::actuators::Enum LIFT_ACTUATOR_ID =
cogip::actuators::Enum{0}; // MOTOR_LIFT_1

/// @brief Lift parameters for lift 1
static const auto lift_params = make_lift_params(LIFT_ACTUATOR_ID);

} // namespace actuators
} // namespace app
} // namespace cogip
18 changes: 18 additions & 0 deletions applications/robot-lift-control/include/lift2_conf.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#pragma once

#include "lift_common_conf.hpp"

namespace cogip {
namespace app {
namespace actuators {

/// @brief Lift 2 actuator ID (for CAN protobuf messages)
inline constexpr cogip::actuators::Enum LIFT_ACTUATOR_ID =
cogip::actuators::Enum{1}; // MOTOR_LIFT_2

/// @brief Lift parameters for lift 2
static const auto lift_params = make_lift_params(LIFT_ACTUATOR_ID);

} // namespace actuators
} // namespace app
} // namespace cogip
Loading
Loading