X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_pyro.c;h=43e73de4a897cfa97ee6cdc851f4c7ef373727f1;hb=d1af180c2d2a2caf1e13f00d83f2b86ba26de27f;hp=154edad5f0f7e4436361644d52705efa941e3c0f;hpb=5872bd10df14b47de0e541bff16d9220af0558aa;p=fw%2Faltos

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index 154edad5..43e73de4 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -375,9 +375,7 @@ ao_pyro(void)
 		ao_sleep(&ao_flight_state);
 
 	for (;;) {
-		ao_alarm(AO_MS_TO_TICKS(100));
-		ao_sleep(&ao_pyro_wakeup);
-		ao_clear_alarm();
+		ao_sleep_for(&ao_pyro_wakeup, AO_MS_TO_TICKS(100));
 		if (ao_flight_state >= ao_flight_landed)
 			break;
 		any_waiting = ao_pyro_check();
@@ -499,13 +497,26 @@ ao_pyro_set(void)
 		}
 		pyro_tmp.flags |= ao_pyro_values[v].flag;
 		if (ao_pyro_values[v].offset != NO_VALUE) {
+			uint8_t negative = 0;
+			ao_cmd_white();
+			if (ao_cmd_lex_c == '-') {
+				negative = 1;
+				ao_cmd_lex();
+			}
 			ao_cmd_decimal();
 			if (ao_cmd_status != ao_cmd_success)
 				return;
-			if (ao_pyro_values[v].flag & AO_PYRO_8_BIT_VALUE)
+			if (ao_pyro_values[v].flag & AO_PYRO_8_BIT_VALUE) {
+				if (negative) {
+					ao_cmd_status = ao_cmd_syntax_error;
+					return;
+				}
 				*((uint8_t *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = ao_cmd_lex_i;
-			else
+			} else {
+				if (negative)
+					ao_cmd_lex_i = -ao_cmd_lex_i;
 				*((int16_t *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = ao_cmd_lex_i;
+			}
 		}
 	}
 	_ao_config_edit_start();