From c628ca44dfadfc4de949389befc536f2e2160272 Mon Sep 17 00:00:00 2001 From: Ben Liao Date: Thu, 20 Jul 2023 10:11:53 +0000 Subject: [PATCH] [MISC] Updated .gitignore, restore HTTP URL for protos submodule - Removed a bunch of irrelevant lines to reduce confusion - Having the SSH URL for protos as the module might cause problems - ... when building Runtime on Raspberry Pis so I reverted it --- .gitignore | 25 ++----------------------- .gitmodules | 2 +- executor/executor.c | 2 +- lowcar/devices/Device/Device.cpp | 2 +- net_handler/protos | 2 +- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 4688eb29..064c6351 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,6 @@ bin/* tests/bin/* -# ignore the tests/devices -tests/devices - # ignore the entire lowcar/Device folder lowcar/Device @@ -24,7 +21,7 @@ network_switch/exit_status.txt *.pyc *.pyo __pycache__/ -build/ +executor/build/ # VS Code .vscode @@ -38,29 +35,11 @@ build/ *.o *.obj -# Precompiled Headers -*.gch -*.pch - # Compiled Dynamic libraries *.so *.dylib *.dll *.pyd -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - +# .DS_Store *.DS_Store diff --git a/.gitmodules b/.gitmodules index 2c03fcff..27d86d02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "net_handler/protos"] path = net_handler/protos - url = git@github.com:pioneers/protos.git + url = https://github.com/pioneers/protos.git diff --git a/executor/executor.c b/executor/executor.c index 9030f072..6415c59e 100644 --- a/executor/executor.c +++ b/executor/executor.c @@ -14,7 +14,7 @@ // runtime includes #include // for runtime logger -#include //for runtime constants (TODO: consider removing relative pathname in include) +#include // for runtime constants #include // Shared memory wrapper to get/send device data diff --git a/lowcar/devices/Device/Device.cpp b/lowcar/devices/Device/Device.cpp index 396dad37..f76e9233 100644 --- a/lowcar/devices/Device/Device.cpp +++ b/lowcar/devices/Device/Device.cpp @@ -57,7 +57,7 @@ void Device::loop() { } else if (sts != Status::NO_DATA) { this->msngr->lowcar_printf("Error when reading message by lowcar device"); } - device_actions(); //[MOVED TO HERE] + device_actions(); // If it's been too long since we received a DEVICE_PING, disable the device // Send a message to Runtime that we will terminate the connection if (this->enabled && (this->timeout > 0) && (this->curr_time - this->last_received_ping_time >= this->timeout)) { diff --git a/net_handler/protos b/net_handler/protos index 8c15c7a7..9e52c0e5 160000 --- a/net_handler/protos +++ b/net_handler/protos @@ -1 +1 @@ -Subproject commit 8c15c7a7680860e0ea45d70df7e88b69c81a3984 +Subproject commit 9e52c0e5cd7ff7b83811145dfc93dbd5ea168f84