Skip to content
Snippets Groups Projects
Commit 1b2cad06 authored by Valtteri Koskivuori's avatar Valtteri Koskivuori
Browse files

Merge branch 'master' into 'master'

lpc+kbd: Disable circle+1 power on cmd when SoM is already on

See merge request reform/reform!27
parents 284f95b4 c085f7ca
No related branches found
No related tags found
No related merge requests found
...@@ -322,6 +322,8 @@ int remote_turn_on_som(void) { ...@@ -322,6 +322,8 @@ int remote_turn_on_som(void) {
return ok; return ok;
} }
if (strncmp(response, "system: already on", 18) == 0) ok = 0;
remote_som_power_expected_state = 1; remote_som_power_expected_state = 1;
return ok; return ok;
} }
......
...@@ -627,9 +627,14 @@ void handle_commands() { ...@@ -627,9 +627,14 @@ void handle_commands() {
sprintf(uartBuffer,"system: auxpwr on\r\n"); sprintf(uartBuffer,"system: auxpwr on\r\n");
uartSend((uint8_t*)uartBuffer, strlen(uartBuffer)); uartSend((uint8_t*)uartBuffer, strlen(uartBuffer));
} else { } else {
turn_som_power_on(); if (som_is_powered) {
sprintf(uartBuffer,"system: on\r\n"); sprintf(uartBuffer,"system: already on\r\n");
uartSend((uint8_t*)uartBuffer, strlen(uartBuffer)); uartSend((uint8_t*)uartBuffer, strlen(uartBuffer));
} else {
turn_som_power_on();
sprintf(uartBuffer,"system: on\r\n");
uartSend((uint8_t*)uartBuffer, strlen(uartBuffer));
}
} }
} }
else if (remote_cmd == 'x') { else if (remote_cmd == 'x') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment