Skip to content

Commit 675b0f5

Browse files
committed
Update
1 parent a033fc3 commit 675b0f5

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

extras/aqua.sh

+21
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,33 @@ function check_git_installed {
182182
function check_curl_installed {
183183
command -v curl >/dev/null 2>&1 || { echoerr "curl is not installed. Installing"; exit 1; }
184184
}
185+
186+
#
187+
# Main
188+
#
189+
190+
# Check we are on a arm 32 bit machine.
191+
192+
# below is compatable on all linux.
193+
#if file -Lb /usr/bin/ld | grep -s -i armhf > /dev/null; then
194+
# dpkg is good for debain distros.
195+
if dpkg --print-architecture | grep -s -i armhf > /dev/null; then
196+
echo "Architecture is armhf";
197+
else
198+
echo "Architecture is '`dpkg --print-architecture`'"
199+
echo "This does not look like linux running on a arm 32 platform"
200+
echo "Please use another install method"
201+
echo "https://github.com/sfeakes/AqualinkD/wiki#Install"
202+
exit
203+
fi
204+
185205
# Check something was passed
186206
if [[ $# -eq 0 ]]; then
187207
print_usage
188208
exit
189209
fi
190210

211+
191212
# Pass command line
192213
if [ "$1" == "release" ]; then
193214
check_curl_installed

onetouch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,8 @@ bool log_qeuiptment_status_VP2(struct aqualinkdata *aq_data)
589589
} else if (PANEL_SIZE() >= 16 ) {
590590
// Loop over RS 16 buttons.
591591
get_RS16buttoninfo_from_menu(aq_data, i);
592-
}
593592
#endif
593+
}
594594
}
595595

596596
return rtn;

release/aqualinkd

20 Bytes
Binary file not shown.

simulator.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#define MAX_STACK 20
1111
int _sim_stack_place = 0;
12-
unsigned char _commands[MAX_STACK];
12+
unsigned char _sim_commands[MAX_STACK];
1313

1414
bool push_simulator_cmd(unsigned char cmd);
1515

@@ -27,7 +27,7 @@ void simulator_send_cmd(unsigned char cmd)
2727
bool push_simulator_cmd(unsigned char cmd)
2828
{
2929
if (_sim_stack_place < MAX_STACK) {
30-
_commands[_sim_stack_place] = cmd;
30+
_sim_commands[_sim_stack_place] = cmd;
3131
_sim_stack_place++;
3232
} else {
3333
LOG(SIM_LOG, LOG_ERR, "Command queue overflow, too many unsent commands to RS control panel\n");
@@ -42,9 +42,9 @@ unsigned char pop_simulator_cmd(unsigned char receive_type)
4242
unsigned char cmd = NUL;
4343

4444
if (_sim_stack_place > 0 && receive_type == CMD_STATUS ) {
45-
cmd = _commands[0];
45+
cmd = _sim_commands[0];
4646
_sim_stack_place--;
47-
memmove(&_commands[0], &_commands[1], sizeof(unsigned char) * _sim_stack_place ) ;
47+
memmove(&_sim_commands[0], &_sim_commands[1], sizeof(unsigned char) * _sim_stack_place ) ;
4848
}
4949

5050
LOG(SIM_LOG,LOG_DEBUG, "Sending '0x%02hhx' to controller\n", cmd);

0 commit comments

Comments
 (0)