Skip to content

Commit a43400b

Browse files
Implemented mower service, fixed all warnings, enabled all warnings, enable treat warning as error
1 parent a13a511 commit a43400b

File tree

19 files changed

+205
-55
lines changed

19 files changed

+205
-55
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE
5454
src/services/power_service/power_service.cpp
5555
src/services/emergency_service/emergency_service.cpp
5656
src/services/diff_drive_service/diff_drive_service.cpp
57+
src/services/mower_service/mower_service.cpp
5758
# BQ2567 driver
5859
src/drivers/bq_2576/bq_2576.cpp
5960
# VESC driver
@@ -85,6 +86,7 @@ target_add_service(${CMAKE_PROJECT_NAME} ImuService ${CMAKE_CURRENT_SOURCE_DIR}/
8586
target_add_service(${CMAKE_PROJECT_NAME} PowerService ${CMAKE_CURRENT_SOURCE_DIR}/services/power_service.json)
8687
target_add_service(${CMAKE_PROJECT_NAME} EmergencyService ${CMAKE_CURRENT_SOURCE_DIR}/services/emergency_service.json)
8788
target_add_service(${CMAKE_PROJECT_NAME} DiffDriveService ${CMAKE_CURRENT_SOURCE_DIR}/services/diff_drive_service.json)
89+
target_add_service(${CMAKE_PROJECT_NAME} MowerService ${CMAKE_CURRENT_SOURCE_DIR}/services/mower_service.json)
8890

8991
set_target_properties(${CMAKE_PROJECT_NAME}
9092
PROPERTIES SUFFIX ".elf")

boards/XCORE/board_ex.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646
mii_write(&ETHD1, 0x00, 0x2A05); \
4747
} while (0)
4848

49-
#define EEPROM_DEVICE_ADDRESS 0b1010011
50-
#define CARRIER_EEPROM_DEVICE_ADDRESS 0b1010000
49+
// eeprom address = 0b1010011
50+
#define EEPROM_DEVICE_ADDRESS 0x53
51+
// carrier eeprom address = 0b1010000
52+
#define CARRIER_EEPROM_DEVICE_ADDRESS 0x50
5153

5254
// Define the fallback IP settings for this board (if DHCP fails)
5355
// 10.0.0.254

cmake/gcc-arm-none-eabi.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ add_compile_definitions(CORTEX_USE_FPU=TRUE)
2727
set(TARGET_FLAGS "-mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard -fomit-frame-pointer -falign-functions=16 -mthumb -fno-common -flto")
2828

2929
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
30-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wpedantic -fdata-sections -ffunction-sections")
30+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wpedantic -fdata-sections -ffunction-sections")
3131
if(CMAKE_BUILD_TYPE MATCHES Debug)
3232
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g3 -DDEBUG_BUILD")
3333
endif()

ext/ChibiOS_21.11.3/ext/lwip/src/api/api_msg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ netconn_free(struct netconn *conn)
830830
static void
831831
netconn_drain(struct netconn *conn)
832832
{
833-
void *mem;
833+
void *mem = NULL;
834834

835835
/* This runs when mbox and netconn are marked as closed,
836836
so we don't need to lock against rx packets */

ext/ChibiOS_21.11.3/ext/lwip/src/api/tcpip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ tcpip_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
126126
static void
127127
tcpip_thread(void *arg)
128128
{
129-
struct tcpip_msg *msg;
129+
struct tcpip_msg *msg = NULL;
130130
LWIP_UNUSED_ARG(arg);
131131

132132
LWIP_MARK_TCPIP_THREAD();

ext/xbot_framework

main.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
#include "services/imu_service/imu_service.hpp"
2323
#include "services/power_service/power_service.hpp"
2424
#include "services/diff_drive_service/diff_drive_service.hpp"
25+
#include "services/mower_service/mower_service.hpp"
2526
EmergencyService emergency_service{1};
2627
DiffDriveService diff_drive{2};
28+
MowerService mower_service{3};
2729
ImuService imu_service{4};
2830
PowerService power_service{5};
2931

@@ -75,7 +77,7 @@ int main(void) {
7577
while (1)
7678
;
7779
}
78-
lwipthread_opts_t lwipconf_opts = {0};
80+
lwipthread_opts_t lwipconf_opts{};
7981
lwipconf_opts.addrMode = NET_ADDRESS_DHCP;
8082
lwipconf_opts.address = 0;
8183
lwipconf_opts.gateway = 0;
@@ -91,6 +93,7 @@ int main(void) {
9193
imu_service.start();
9294
power_service.start();
9395
diff_drive.start();
96+
mower_service.start();
9497

9598
// Subscribe to global events and dispatch to our services
9699
event_listener_t event_listener;

portable/Io.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ fd_set socket_set;
3333
using namespace xbot::service;
3434

3535
void runIo(void* arg) {
36+
(void)arg;
3637
while (true) {
3738
packet::PacketPtr packet = nullptr;
3839

portable/mutex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bool xbot::service::mutex::initialize(MutexPtr mutex) {
1010
return true;
1111
}
1212

13-
void xbot::service::mutex::deinitialize(MutexPtr mutex) {}
13+
void xbot::service::mutex::deinitialize(MutexPtr mutex) { (void)mutex; }
1414

1515
void xbot::service::mutex::lockMutex(MutexPtr mutex) { chMtxLock(mutex); }
1616

portable/queue.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
bool xbot::service::queue::initialize(QueuePtr queue, size_t queue_length,
77
void* buffer, size_t buffer_size) {
8+
(void)queue_length;
89
chMBObjectInit(queue, static_cast<msg_t*>(buffer),
910
buffer_size / sizeof(msg_t));
1011
return true;
@@ -26,4 +27,4 @@ bool xbot::service::queue::queuePushItem(QueuePtr queue, void* item) {
2627
TIME_IMMEDIATE) == MSG_OK;
2728
}
2829

29-
void xbot::service::queue::deinitialize(QueuePtr queue) {}
30+
void xbot::service::queue::deinitialize(QueuePtr queue) { (void)queue; }

0 commit comments

Comments
 (0)