Skip to content

Commit

Permalink
[MISC] Updated .gitignore, restore HTTP URL for protos submodule
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
benliao1 committed Jul 20, 2023
1 parent e0117fd commit c628ca4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 27 deletions.
25 changes: 2 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
bin/*
tests/bin/*

# ignore the tests/devices
tests/devices

# ignore the entire lowcar/Device folder
lowcar/Device

Expand All @@ -24,7 +21,7 @@ network_switch/exit_status.txt
*.pyc
*.pyo
__pycache__/
build/
executor/build/

# VS Code
.vscode
Expand All @@ -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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion executor/executor.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// runtime includes
#include <logger.h> // for runtime logger
#include <runtime_util.h> //for runtime constants (TODO: consider removing relative pathname in include)
#include <runtime_util.h> // for runtime constants
#include <shm_wrapper.h> // Shared memory wrapper to get/send device data


Expand Down
2 changes: 1 addition & 1 deletion lowcar/devices/Device/Device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion net_handler/protos
Submodule protos updated 1 files
+0 −19 security.proto

0 comments on commit c628ca4

Please sign in to comment.