Skip to content

Commit f47149c

Browse files
committed
Merge remote-tracking branch 'origin/2.8' into 2.9
* origin/2.8: toolchanger test: oops, forgot to wait for status buffer to update src:usr_intf language name typos Update pncconf.py
2 parents ee666f0 + aaa333c commit f47149c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/emc/usr_intf/emclcd.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,9 @@ static int createMenus()
817817

818818
sockSendStr(sockfd, "menu_add_item setup language menu {Set Language}\n");
819819
sockSendStr(sockfd, "menu_add_item language english action {English}\n");
820-
sockSendStr(sockfd, "menu_add_item language spanish action {Espanol}\n");
821-
sockSendStr(sockfd, "menu_add_item language french action {Francais}\n");
822-
sockSendStr(sockfd, "menu_add_item language german action {Deutch}\n");
820+
sockSendStr(sockfd, "menu_add_item language spanish action {Español}\n");
821+
sockSendStr(sockfd, "menu_add_item language french action {Français}\n");
822+
sockSendStr(sockfd, "menu_add_item language german action {Deutsch}\n");
823823
sockSendStr(sockfd, "menu_add_item language italian action {Italiano}\n");
824824

825825
sockSendStr(sockfd, "menu_add_item {} utility menu {Utilities}\n");

tests/toolchanger/reload-tool/non-random/test-ui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ def wait_for_hal_pin(name, value, timeout=10):
101101
assert(h['tool-prep-pocket'] == 46)
102102
assert(h['tool-from-pocket'] == 0)
103103

104+
time.sleep(stat_poll_wait)
104105
s.poll()
105106
assert(s.tool_in_spindle == 0)
106107
assert(s.tool_from_pocket == 0);

0 commit comments

Comments
 (0)