Skip to content

Commit 3bc73e0

Browse files
committed
Merge branch 'atmega' of https://github.com/lwa-project/analog_signal_processor into atmega
2 parents 486fc3c + f9cbe1b commit 3bc73e0

17 files changed

+669
-668
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
- name: "Software Install - Ubuntu"
1313
if: ${{ matrix.os == 'ubuntu-latest' }}
1414
run: |
15+
sudo apt-get update && \
1516
sudo apt-get install -y \
1617
build-essential \
1718
ca-certificates \

arx_control/aspCommon.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ bool ATmega::open() {
6363
while( open_attempts < ATMEGA_OPEN_MAX_ATTEMPTS ) {
6464
try {
6565
fd = atmega::open(_sn);
66-
break;
66+
break;
6767
} catch(const std::exception& e) {
68-
open_attempts++;
69-
std::this_thread::sleep_for(std::chrono::milliseconds(ATMEGA_OPEN_WAIT_MS));
68+
open_attempts++;
69+
std::this_thread::sleep_for(std::chrono::milliseconds(ATMEGA_OPEN_WAIT_MS));
7070
}
7171
}
7272

@@ -78,8 +78,8 @@ bool ATmega::open() {
7878

7979
int n = atmega::send_command(fd, &cmd, &resp, ATMEGA_OPEN_MAX_ATTEMPTS, ATMEGA_OPEN_WAIT_MS);
8080
if( (n > 0) && (resp.command & atmega::COMMAND_FAILURE) == 0 ) {
81-
found = true;
82-
_fd = fd;
81+
found = true;
82+
_fd = fd;
8383
}
8484
} catch(const std::exception& e) {}
8585

@@ -120,11 +120,11 @@ bool ATmega::open() {
120120
int open_attempts = 0;
121121
while( open_attempts < ATMEGA_OPEN_MAX_ATTEMPTS ) {
122122
try {
123-
fd = atmega::open(dev_name);
124-
break;
123+
fd = atmega::open(dev_name);
124+
break;
125125
} catch(const std::exception& e) {
126-
open_attempts++;
127-
std::this_thread::sleep_for(std::chrono::milliseconds(ATMEGA_OPEN_WAIT_MS));
126+
open_attempts++;
127+
std::this_thread::sleep_for(std::chrono::milliseconds(ATMEGA_OPEN_WAIT_MS));
128128
}
129129
}
130130

0 commit comments

Comments
 (0)