- if(new_status_format) {
- str.append("|WPos:").append(buf, n);
- // current feedrate
- float fr= robot->from_millimeters(conveyor->get_current_feedrate()*60.0F);
- n = snprintf(buf, sizeof(buf), "|F:%1.4f", fr);
- if(n > sizeof(buf)) n= sizeof(buf);
- str.append(buf, n);
- float sr= robot->get_s_value();
- n = snprintf(buf, sizeof(buf), "|S:%1.4f", sr);
- if(n > sizeof(buf)) n= sizeof(buf);
- str.append(buf, n);
-
- // current Laser power
- #ifndef NO_TOOLS_LASER
- Laser *plaser= nullptr;
- if(PublicData::get_value(laser_checksum, (void *)&plaser) && plaser != nullptr) {
- float lp= plaser->get_current_power();
- n = snprintf(buf, sizeof(buf), "|L:%1.4f", lp);
- if(n > sizeof(buf)) n= sizeof(buf);
- str.append(buf, n);
- }
- #endif
-
- }else{
- str.append(",WPos:").append(buf, n);
- }
+ str.append("|WPos:").append(buf, n);
+ // current feedrate
+ float fr= robot->from_millimeters(conveyor->get_current_feedrate()*60.0F);
+ n = snprintf(buf, sizeof(buf), "|F:%1.4f", fr);
+ if(n > sizeof(buf)) n= sizeof(buf);
+ str.append(buf, n);
+ float sr= robot->get_s_value();
+ n = snprintf(buf, sizeof(buf), "|S:%1.4f", sr);
+ if(n > sizeof(buf)) n= sizeof(buf);
+ str.append(buf, n);
+
+ // current Laser power
+ #ifndef NO_TOOLS_LASER
+ Laser *plaser= nullptr;
+ if(PublicData::get_value(laser_checksum, (void *)&plaser) && plaser != nullptr) {
+ float lp= plaser->get_current_power();
+ n = snprintf(buf, sizeof(buf), "|L:%1.4f", lp);
+ if(n > sizeof(buf)) n= sizeof(buf);
+ str.append(buf, n);
+ }
+ #endif