Commit 7ef7086
committed
Merge remote-tracking branch 'origin/2.9'
* origin/2.9:
document the `homed` field of the `linuxcnc` python module
Remove feral debug print
Fix for #2410
mesa_modbus: Only wait between packets that cause a write4 files changed
Lines changed: 20 additions & 12 deletions
File tree
- src
- emc
- rs274ngc
- usr_intf/axis/extensions
- hal/drivers/mesa-hostmot2/modbus
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5290 | 5290 | | |
5291 | 5291 | | |
5292 | 5292 | | |
5293 | | - | |
5294 | | - | |
5295 | | - | |
5296 | | - | |
5297 | | - | |
| 5293 | + | |
| 5294 | + | |
| 5295 | + | |
| 5296 | + | |
5298 | 5297 | | |
5299 | 5298 | | |
5300 | 5299 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
66 | 70 | | |
67 | 71 | | |
68 | | - | |
69 | 72 | | |
70 | 73 | | |
71 | 74 | | |
| |||
120 | 123 | | |
121 | 124 | | |
122 | 125 | | |
123 | | - | |
124 | | - | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
125 | 132 | | |
126 | 133 | | |
127 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
805 | 805 | | |
806 | 806 | | |
807 | 807 | | |
808 | | - | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
809 | 811 | | |
810 | 812 | | |
811 | 813 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
472 | 472 | | |
473 | 473 | | |
474 | 474 | | |
475 | | - | |
| 475 | + | |
476 | 476 | | |
477 | 477 | | |
478 | 478 | | |
| |||
517 | 517 | | |
518 | 518 | | |
519 | 519 | | |
520 | | - | |
521 | 520 | | |
522 | 521 | | |
523 | 522 | | |
| |||
538 | 537 | | |
539 | 538 | | |
540 | 539 | | |
| 540 | + | |
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
| |||
0 commit comments