Skip to content

Commit

Permalink
fixing build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
setaremalekiii committed Jan 31, 2025
1 parent c22b28c commit e08ccee
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 8 deletions.
7 changes: 5 additions & 2 deletions firmware/quadruna/sil/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ IF("${TARGET}" STREQUAL "sil")
"${CMAKE_CURRENT_SOURCE_DIR}/src/manager/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/shared/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/src/shared/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../CRIT/io/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../CRIT/io/*.cpp"
)

add_executable(quadruna_sil "${SRCS}")
target_include_directories(
quadruna_sil PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/src/manager"
"${CMAKE_CURRENT_SOURCE_DIR}/src/shared"
"${CMAKE_CURRENT_SOURCE_DIR}/../CRIT/io"
)

# Add CZMQ.
target_link_libraries (quadruna_sil ${CZMQ_LIBRARIES})
# Add CZMQ and math lib
target_link_libraries (quadruna_sil ${CZMQ_LIBRARIES} m)
target_include_directories(quadruna_sil PRIVATE "${CZMQ_INCLUDE_DIRS}")
ENDIF()
1 change: 1 addition & 0 deletions firmware/quadruna/sil/src/manager/main.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <czmq.h>
#include <stdint.h>

#include "sil_board.h"
#include "sil_manager.h"
Expand Down
1 change: 1 addition & 0 deletions firmware/quadruna/sil/src/shared/board_procedures.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "sil_api.h"
#include "board_procedures.h"

void set_pedal_percentage_50()
Expand Down
1 change: 0 additions & 1 deletion firmware/quadruna/sil/src/shared/board_procedures.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "sil_api.h"

void set_pedal_percentage_50();
void turn_BMS_light_on();
Expand Down
7 changes: 5 additions & 2 deletions firmware/quadruna/sil/src/shared/sil_api.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "sil_api.h"
#include <czmq.h>
#include "sil_atoi.h"
#include "board_procedures.h"

// can topic.

Expand Down Expand Up @@ -170,7 +169,11 @@ sil_api_TimeReq *sil_api_timeReq_rx(zmsg_t *zmqMsg)
return res;
}

sil_api_Procedure *sil_api_procedure_new(char board_procedure)
void sil_api_timeReq_destroy(sil_api_TimeReq *msg){
free(msg);
}

sil_api_Procedure *sil_api_procedure_new(void (*board_procedure)(void))
{
sil_api_Procedure *res = malloc(sizeof(sil_api_Procedure));
res->board_procedure = board_procedure;
Expand Down
7 changes: 4 additions & 3 deletions firmware/quadruna/sil/src/shared/sil_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <string.h>
#include <czmq.h>
#include <stdint.h>
#include "board_procedures.h"

// can topic.
// Sent from boards, each message denotes a JsonCanMsg.
Expand Down Expand Up @@ -139,13 +138,15 @@ void sil_api_timeReq_destroy(sil_api_TimeReq *msg);
#define SIL_API_PROCEDURE_TOPIC ("board_procedure")

// struct pointing to the appropriate board prcedure
typedef struct
typedef struct sil_api_Procedure
{
void (*board_procedure)(void);
} sil_api_Procedure;

// creating a new message rx/tx and destroy
sil_api_Procedure *sil_api_procedure_new(char board_procedure);
//sil_api_Procedure *sil_api_procedure_new(char board_procedure);
sil_api_Procedure *sil_api_procedure_new(void (*board_procedure)(void));

int sil_api_procedure_tx(sil_api_Procedure *msg, zsock_t *socket);
sil_api_Procedure *sil_api_procedure_rx(zmsg_t *zmqMsg);
void sil_api_procedure_destroy(sil_api_Procedure *msg);
1 change: 1 addition & 0 deletions firmware/quadruna/sil/src/shared/sil_atoi.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <stdint.h>

// Utility macros to define atoi-style functions for arbritrary uint types.
// Generates functions of name sil_atoi_TYPE, ie. sil_atoi_uint32_t.
Expand Down

0 comments on commit e08ccee

Please sign in to comment.