meswork/wasm-simulator
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emit feed mode state events

Browse Source
This commit is contained in:
CNC Local
2026-05-22 05:33:58 +08:00
parent 1d0acddf12
commit e941c9bbb4
9 changed files with 136 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/canon_event_sink.cpp
View File

@@ -111,6 +111,13 @@ void CanonEventSink::set_feed_rate(double feed, int line) {
emit(event);
}
void CanonEventSink::set_feed_mode(int mode, int line) {
CncSimEvent event = base_event(CNC_SIM_EVENT_SET_FEED, line);
event.feed = feed_;
event.reserved = mode;
emit(event);
}
void CanonEventSink::set_spindle_speed(double spindle, int line) {
spindle_ = spindle;
CncSimEvent event = base_event(CNC_SIM_EVENT_SET_SPINDLE, line);

1
core/src/canon_event_sink.h
View File

@@ -21,6 +21,7 @@ public:
void use_length_units(double scale, int line);
void select_plane(int plane, int line);
void set_feed_rate(double feed, int line);
void set_feed_mode(int mode, int line);
void set_spindle_speed(double spindle, int line);
void start_spindle(int direction, int line);
void stop_spindle(int line);

17
core/src/linuxcnc_canon_bridge.cpp
View File

@@ -7,6 +7,7 @@
#include <cstdarg>
#include <cstdio>
#include <cstring>
#include <string_view>
#include <cstdlib>
#include <string>
#include <vector>
@@ -296,6 +297,9 @@ void SET_FEED_REFERENCE(CANON_FEED_REFERENCE) {
}
void SET_FEED_MODE(int, int) {
if (active_sink) {
active_sink->set_feed_mode(0, event_line());
}
}
void SET_MOTION_CONTROL_MODE(CANON_MOTION_MODE, double) {
@@ -427,8 +431,17 @@ void RELOAD_TOOLDATA(void) {
void CLAMP_AXIS(CANON_AXIS) {
}
void COMMENT(const char *) {
emit_state_event(CNC_SIM_EVENT_COMMENT, 0);
void COMMENT(const char *message) {
int reserved = 0;
const std::string_view text = message ? std::string_view(message) : std::string_view();
if (text.find("feed mode set to inverse time") != std::string_view::npos) {
reserved = 93;
} else if (text.find("feed mode set to units per minute") != std::string_view::npos) {
reserved = 94;
} else if (text.find("feed mode set to units per revolution") != std::string_view::npos) {
reserved = 95;
}
emit_state_event(CNC_SIM_EVENT_COMMENT, reserved);
}
void DISABLE_ADAPTIVE_FEED() {

9
core/src/smoke_gcode_parser.cpp
View File

@@ -314,6 +314,15 @@ int SmokeGcodeParser::parse(const char *program, size_t program_len, std::string
absolute_ = true;
} else if (g == 91) {
absolute_ = false;
} else if (g == 93 || g == 94 || g == 95) {
emit_comment_state(sink_, line_number, g);
if (stop_if_callback_aborted(sink_, error)) {
return -1;
}
sink_.set_feed_mode(g == 95 ? 1 : 0, line_number);
if (stop_if_callback_aborted(sink_, error)) {
return -1;
}
} else if (g == 0 || g == 1 || g == 2 || g == 3) {
modal_motion = g;
} else if (g == 4) {

42
core/tests/cnc_sim_api_linuxcnc_rs274_smoke.cpp
View File

@@ -86,6 +86,11 @@ int main() {
bool saw_flood_on = false;
bool saw_mist_off = false;
bool saw_flood_off = false;
bool saw_g93_mode = false;
bool saw_g94_mode = false;
bool saw_g95_mode = false;
bool saw_g94_feed_mode = false;
bool saw_g95_feed_mode = false;
for (const auto &event : events) {
saw_tool = saw_tool || event.type == CNC_SIM_EVENT_TOOL_CHANGE;
saw_rapid = saw_rapid || event.type == CNC_SIM_EVENT_RAPID;
@@ -243,6 +248,43 @@ int main() {
ok &= expect(saw_mist_off, "expected LinuxCNC M9 mist off state");
ok &= expect(saw_flood_off, "expected LinuxCNC M9 flood off state");
const char feed_mode_program[] =
"G21 G90 G17\n"
"G93\n"
"G94\n"
"G95\n"
"M30\n";
events.clear();
ok &= expect(cnc_sim_parse_program(sim, feed_mode_program, sizeof(feed_mode_program) - 1) == 0,
cnc_sim_last_error(sim));
for (const auto &event : events) {
saw_g93_mode = saw_g93_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 2 &&
event.reserved == 93);
saw_g94_mode = saw_g94_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 3 &&
event.reserved == 94);
saw_g95_mode = saw_g95_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 4 &&
event.reserved == 95);
saw_g94_feed_mode = saw_g94_feed_mode ||
(event.type == CNC_SIM_EVENT_SET_FEED &&
event.line == 3 &&
event.reserved == 0);
saw_g95_feed_mode = saw_g95_feed_mode ||
(event.type == CNC_SIM_EVENT_SET_FEED &&
event.line == 4 &&
event.reserved == 0);
}
ok &= expect(saw_g93_mode, "expected LinuxCNC G93 feed mode state");
ok &= expect(saw_g94_mode, "expected LinuxCNC G94 feed mode state");
ok &= expect(saw_g95_mode, "expected LinuxCNC G95 feed mode state");
ok &= expect(saw_g94_feed_mode, "expected LinuxCNC G94 set-feed mode event");
ok &= expect(saw_g95_feed_mode, "expected LinuxCNC G95 set-feed mode event");
const char comment_program[] =
"G21 G90 G17\n"
"(operator note)\n"

35
core/tests/cnc_sim_api_smoke.cpp
View File

@@ -77,6 +77,10 @@ int main() {
bool saw_flood_on = false;
bool saw_mist_off = false;
bool saw_flood_off = false;
bool saw_g93_mode = false;
bool saw_g94_mode = false;
bool saw_g95_mode = false;
bool saw_g95_feed_mode = false;
bool saw_incremental_move = false;
bool saw_r_arc_center = false;
for (const auto &event : events) {
@@ -226,6 +230,37 @@ int main() {
ok &= expect(saw_mist_off, "expected M9 mist off state");
ok &= expect(saw_flood_off, "expected M9 flood off state");
const char feed_mode_program[] =
"G21\n"
"G93\n"
"G94\n"
"G95\n";
events.clear();
ok &= expect(cnc_sim_parse_program(sim, feed_mode_program, sizeof(feed_mode_program) - 1) == 0,
cnc_sim_last_error(sim));
for (const auto &event : events) {
saw_g93_mode = saw_g93_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 2 &&
event.reserved == 93);
saw_g94_mode = saw_g94_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 3 &&
event.reserved == 94);
saw_g95_mode = saw_g95_mode ||
(event.type == CNC_SIM_EVENT_COMMENT &&
event.line == 4 &&
event.reserved == 95);
saw_g95_feed_mode = saw_g95_feed_mode ||
(event.type == CNC_SIM_EVENT_SET_FEED &&
event.line == 4 &&
event.reserved == 1);
}
ok &= expect(saw_g93_mode, "expected G93 feed mode state");
ok &= expect(saw_g94_mode, "expected G94 feed mode state");
ok &= expect(saw_g95_mode, "expected G95 feed mode state");
ok &= expect(saw_g95_feed_mode, "expected G95 feed-per-rev set-feed mode");
const char linuxcnc_config[] = "{\"backend\":\"linuxcnc-rs274\"}";
config_rc = cnc_sim_load_config_json(sim, linuxcnc_config, sizeof(linuxcnc_config) - 1);
rc = cnc_sim_parse_program(sim, program, sizeof(program) - 1);