Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@ set(SIMULITH_SOURCES
src/simulith_client.c
src/simulith_server.c
src/simulith_time.c
src/simulith_can.c
src/simulith_gpio.c
src/simulith_i2c.c
src/simulith_pwm.c
src/simulith_spi.c
src/simulith_uart.c
src/simulith_transport.c
)

# Build Simulith static library with -fPIC, used by HWLIB
Expand Down Expand Up @@ -117,6 +112,11 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
-Wno-misleading-indentation
-Wno-redundant-decls # Fix atanh redeclaration issue
-Wno-strict-prototypes # Fix prototype warnings
-Wno-switch-default # Relax switch default case warnings
-Wno-float-equal # Relax floating-point equality warnings
-Wno-strict-overflow # Relax strict overflow warnings
-Wno-implicit-fallthrough # Relax implicit fallthrough warnings
-Wno-sign-compare # Relax signed/unsigned comparison warnings
-Wno-error # Turn off -Werror for 42
)
endif()
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ build-test:
mkdir -p $(BUILDDIR)
cd $(BUILDDIR) && cmake .. -DBUILD_SIMULITH_TESTS=ON
$(MAKE) --no-print-directory -C $(BUILDDIR)
cd $(BUILDDIR) && $(MAKE) test
cd $(BUILDDIR) && ctest --output-on-failure -O ctest.log

clean:
rm -rf $(BUILDDIR)
Expand Down
24 changes: 12 additions & 12 deletions include/simulith.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
#include <zmq.h>

// Include interface headers
#include "simulith_can.h"
#include "simulith_gpio.h"
#include "simulith_i2c.h"
#include "simulith_pwm.h"
#include "simulith_spi.h"
#include "simulith_transport.h"
#include "simulith_time.h"
#include "simulith_uart.h"

// Defines
#define SERVER_PUB_ADDR "tcp://0.0.0.0:5000"
#define SERVER_REP_ADDR "tcp://0.0.0.0:5001"
#define SERVER_PUB_ADDR "tcp://0.0.0.0:50000"
#define SERVER_REP_ADDR "tcp://0.0.0.0:50001"

#define CLIENT_PUB_ADDR "tcp://tryspace-server:5000"
#define CLIENT_REP_ADDR "tcp://tryspace-server:5001"
#define CLIENT_PUB_ADDR "tcp://tryspace-server:50000"
#define CLIENT_REP_ADDR "tcp://tryspace-server:50001"

#define LOCAL_PUB_ADDR "ipc:///tmp/simulith_pub"
#define LOCAL_REP_ADDR "ipc:///tmp/simulith_rep"
#define LOCAL_PUB_ADDR "ipc:///tmp/simulith_pub:50000"
#define LOCAL_REP_ADDR "ipc:///tmp/simulith_rep:50001"

#define INTERVAL_NS 10000000UL // 10ms tick interval

#define SIMULITH_UART_BASE_PORT 51000
#define SIMULITH_I2C_BASE_PORT 52000
#define SIMULITH_SPI_BASE_PORT 53000
#define SIMULITH_GPIO_BASE_PORT 54000

#ifdef __cplusplus
extern "C"
{
Expand Down
117 changes: 0 additions & 117 deletions include/simulith_can.h

This file was deleted.

3 changes: 0 additions & 3 deletions include/simulith_component.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ typedef struct {
int (*init)(component_state_t** state);
void (*tick)(component_state_t* state, uint64_t tick_time_ns, const simulith_42_context_t* context_42);
void (*cleanup)(component_state_t* state);

// Optional configuration function
int (*configure)(component_state_t* state, const char* config);
} component_interface_t;

// Component registration function type
Expand Down
84 changes: 0 additions & 84 deletions include/simulith_gpio.h

This file was deleted.

87 changes: 0 additions & 87 deletions include/simulith_i2c.h

This file was deleted.

Loading