Skip to content

Commit

Permalink
Merge pull request #169 from cogip/168-cup-2024-fixes
Browse files Browse the repository at this point in the history
168 cup 2024 fixes
  • Loading branch information
gdoffe authored Jul 27, 2024
2 parents 7367bac + b2f040b commit a745415
Show file tree
Hide file tree
Showing 89 changed files with 1,168 additions and 1,585 deletions.
3 changes: 3 additions & 0 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ else
CFLAGS += -D"MALLINFO_FUNC()=mallinfo()"
endif

# Display only errors
CFLAGS += -DLOG_LEVEL=LOG_ERROR

# Activate asserts debug
CFLAGS += -DDEBUG_ASSERT_VERBOSE

Expand Down
12 changes: 6 additions & 6 deletions applications/cup2024-pami/include/real/app_conf.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
#include "etl/numeric.h"

// Linear pose PID
constexpr double linear_pose_pid_kp = 0.1;
constexpr double linear_pose_pid_kp = 1;
constexpr double linear_pose_pid_ki = 0;
constexpr double linear_pose_pid_kd = 0;
// Angular pose PID
constexpr double angular_pose_pid_kp = 0.2;
constexpr double angular_pose_pid_kp = 1;
constexpr double angular_pose_pid_ki = 0;
constexpr double angular_pose_pid_kd = 0;
// Linear speed PID
constexpr double linear_speed_pid_kp = 12;
constexpr double linear_speed_pid_ki = 1.5;
constexpr double linear_speed_pid_kp = 100;
constexpr double linear_speed_pid_ki = 10;
constexpr double linear_speed_pid_kd = 0;
// Angular speed PID
constexpr double angular_speed_pid_kp = 50;
constexpr double angular_speed_pid_ki = 3;
constexpr double angular_speed_pid_kp = 100;
constexpr double angular_speed_pid_ki = 10;
constexpr double angular_speed_pid_kd = 0;

// Linear pose PID integral limit
Expand Down
3 changes: 0 additions & 3 deletions boards/cogip-board-ng/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions boards/cogip-board-ng/Makefile.dep

This file was deleted.

13 changes: 0 additions & 13 deletions boards/cogip-board-ng/Makefile.features

This file was deleted.

8 changes: 0 additions & 8 deletions boards/cogip-board-ng/Makefile.include

This file was deleted.

51 changes: 0 additions & 51 deletions boards/cogip-board-ng/board.c

This file was deleted.

4 changes: 0 additions & 4 deletions boards/cogip-board-ng/dist/openocd.cfg

This file was deleted.

60 changes: 0 additions & 60 deletions boards/cogip-board-ng/include/board.h

This file was deleted.

198 changes: 0 additions & 198 deletions boards/cogip-board-ng/include/periph_conf.h

This file was deleted.

1 change: 0 additions & 1 deletion boards/cogip-board/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ extern "C" {
#define PCF857X_PORT_0 0

/* Servomotors */
#define LX_DIR_PIN GPIO_PIN(PORT_C, 15)
#define LX_UART_DEV 1

/**
Expand Down
Loading

0 comments on commit a745415

Please sign in to comment.