diff options
| -rw-r--r-- | client/i18n/nl_nl.h | 7 | ||||
| -rw-r--r-- | client/makefile | 2 | ||||
| -rw-r--r-- | client/serial_linux.c | 1 | ||||
| -rw-r--r-- | robot/errcatch.c | 1 | ||||
| -rw-r--r-- | robot/io.c | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/client/i18n/nl_nl.h b/client/i18n/nl_nl.h index 8caf1de..a2bbb47 100644 --- a/client/i18n/nl_nl.h +++ b/client/i18n/nl_nl.h @@ -59,6 +59,7 @@ #define W2_UI_ERROR_INT_W2_E_WARN_SERIAL_NOISY "W2_E_WARN_SERIAL_NOISY" #define W2_UI_ERROR_INT_W2_E_WARN_MODE_HISTORY_BUFFER_IOB "W2_E_WARN_MODE_HISTORY_BUFFER_IOB" #define W2_UI_ERROR_INT_W2_E_WARN_PING_TIMEOUT "W2_E_WARN_PING_TIMEOUT" +#define W2_UI_ERROR_INT_W2_E_INFO_ORDER_ARRIVED "W2_E_INFO_ORDER_ARRIVED" #define W2_UI_ERROR_USR_W2_E_UNKNOWN "onbekende error code" #define W2_UI_ERROR_USR_W2_E_CRIT_CONN_LOST "verbinding met de robot verloren" @@ -77,6 +78,7 @@ #define W2_UI_ERROR_USR_W2_E_WARN_SERIAL_NOISY "ongeldige seriele informatie gedetecteerd, (ruisend kanaal / controleer de verbinding?)" #define W2_UI_ERROR_USR_W2_E_WARN_MODE_HISTORY_BUFFER_IOB "mode geschiedenisbuffer index is buiten bereik" #define W2_UI_ERROR_USR_W2_E_WARN_PING_TIMEOUT "ping time-out" +#define W2_UI_ERROR_USR_W2_E_INFO_ORDER_ARRIVED "bij order locatie aangekomen" #define W2_UI_ORDER_CMD_HELP "help" #define W2_UI_ORDER_CMD_START "start" @@ -107,9 +109,12 @@ "1 - kies doolhof modus\n" \ "2 - kies grid modus\n" \ "3 - noodstop\n" \ - "4 - kies oplaad modus\n" \ + "4 - stel in op oplaad modus\n" \ "5 - natte vloer simulatie\n" \ "6 - calibreer sensoren\n" \ + "7 - doelgebied instelen op doolhof\n" \ + "8 - doelgebied instelen op grid\n" \ + "9 - doelgebied instelen op oplaadstation\n" \ "\n" \ "0 - vorige\n" \ diff --git a/client/makefile b/client/makefile index e72b585..d89c186 100644 --- a/client/makefile +++ b/client/makefile @@ -1,7 +1,7 @@ CC = gcc LD = gcc RM = rm -f -CFLAGS = -DW2_LANG_EN_US +CFLAGS = -DW2_LANG_NL_NL LDFLAGS = -lncursesw EXECNAME = main diff --git a/client/serial_linux.c b/client/serial_linux.c index 2497fac..0501cdf 100644 --- a/client/serial_linux.c +++ b/client/serial_linux.c @@ -67,6 +67,7 @@ int w2_serial_read() { } bool w2_serial_write(char *data, uint8_t length) { + usleep(1e3); return write(g_w2_serial_handle, data, length) == length; } diff --git a/robot/errcatch.c b/robot/errcatch.c index 3e62270..b212e8b 100644 --- a/robot/errcatch.c +++ b/robot/errcatch.c @@ -21,6 +21,7 @@ void w2_errcatch_display_error(uint8_t code) { void w2_errcatch_error_beep(uint8_t code) { if (code == W2_E_WARN_UNCAUGHT_ERROR) return; if (code == W2_E_WARN_CYCLE_EXPIRED) return; + if (code == W2_E_WARN_PING_TIMEOUT) return; uint8_t severity = code & W2_E_TYPE_MASK; if ((severity ^ W2_E_TYPE_CRIT) == 0) { play("L70 O6 fRfRfRfRf"); @@ -53,7 +53,7 @@ void w2_io_battery_logic() { if (g_w2_io_battery_percentage <= W2_BATTERY_PERCENTAGE_LOW && g_w2_target_area != W2_AREA_CHRG) { w2_errcatch_throw(W2_E_WARN_BATTERY_LOW); - g_w2_target_area = W2_AREA_CHRG; + // g_w2_target_area = W2_AREA_CHRG; } } |