debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
This commit is contained in:
PavelSindler
parent
869c8caaa0
commit
f0cc313fed
@ -446,7 +446,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
|
||||
// When enabled Marlin will send a busy status message to the host
|
||||
// every couple of seconds when it can't accept commands.
|
||||
//
|
||||
#ifndef HEATBED_ANALYSIS
|
||||
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
|
||||
#endif //HEATBED_ANALYSIS
|
||||
#define HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
||||
|
||||
//LCD and SD support
|
||||
|
||||
@ -311,9 +311,9 @@ extern float retract_length_swap;
|
||||
extern float retract_recover_length_swap;
|
||||
#endif
|
||||
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
|
||||
extern uint8_t host_keepalive_interval;
|
||||
#endif
|
||||
|
||||
|
||||
extern unsigned long starttime;
|
||||
extern unsigned long stoptime;
|
||||
@ -397,13 +397,12 @@ extern void check_babystep();
|
||||
extern void long_pause();
|
||||
extern void crashdet_stop_and_save_print();
|
||||
|
||||
#ifdef DIS
|
||||
|
||||
#ifdef HEATBED_ANALYSIS
|
||||
void d_setup();
|
||||
float d_ReadData();
|
||||
void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y);
|
||||
|
||||
#endif
|
||||
void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y);
|
||||
#endif //HEATBED_ANALYSIS
|
||||
float temp_comp_interpolation(float temperature);
|
||||
void temp_compensation_apply();
|
||||
void temp_compensation_start();
|
||||
@ -443,7 +442,7 @@ extern void restore_print_from_ram_and_continue(float e_move);
|
||||
extern uint16_t print_time_remaining();
|
||||
extern uint8_t calc_percent_done();
|
||||
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
|
||||
|
||||
// States for managing Marlin and host communication
|
||||
// Marlin sends messages if blocked or busy
|
||||
@ -466,7 +465,6 @@ extern void host_keepalive();
|
||||
//extern MarlinBusyState busy_state;
|
||||
extern int busy_state;
|
||||
|
||||
#endif //HOST_KEEPALIVE_FEATURE
|
||||
|
||||
#ifdef TMC2130
|
||||
|
||||
|
||||
@ -302,16 +302,9 @@ int fanSpeed=0;
|
||||
|
||||
bool cancel_heatup = false ;
|
||||
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
|
||||
int busy_state = NOT_BUSY;
|
||||
static long prev_busy_signal_ms = -1;
|
||||
uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL;
|
||||
#else
|
||||
#define host_keepalive();
|
||||
#define KEEPALIVE_STATE(n);
|
||||
#endif
|
||||
|
||||
int busy_state = NOT_BUSY;
|
||||
static long prev_busy_signal_ms = -1;
|
||||
uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL;
|
||||
|
||||
const char errormagic[] PROGMEM = "Error:";
|
||||
const char echomagic[] PROGMEM = "echo:";
|
||||
@ -1696,12 +1689,14 @@ void serial_read_stream() {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
/**
|
||||
* Output a "busy" message at regular intervals
|
||||
* while the machine is not accepting commands.
|
||||
*/
|
||||
void host_keepalive() {
|
||||
#ifndef HOST_KEEPALIVE_FEATURE
|
||||
return;
|
||||
#endif //HOST_KEEPALIVE_FEATURE
|
||||
if (farm_mode) return;
|
||||
long ms = _millis();
|
||||
if (host_keepalive_interval && busy_state != NOT_BUSY) {
|
||||
@ -1726,7 +1721,7 @@ void host_keepalive() {
|
||||
}
|
||||
prev_busy_signal_ms = ms;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// The loop() function is called in an endless loop by the Arduino framework from the default main() routine.
|
||||
// Before loop(), the setup() function is called by the main() routine.
|
||||
@ -4295,44 +4290,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef DIS
|
||||
case 77:
|
||||
{
|
||||
//! G77 X200 Y150 XP100 YP15 XO10 Y015
|
||||
//! for 9 point mesh bed leveling G77 X203 Y196 XP3 YP3 XO0 YO0
|
||||
//! G77 X232 Y218 XP116 YP109 XO-11 YO0
|
||||
|
||||
float dimension_x = 40;
|
||||
float dimension_y = 40;
|
||||
int points_x = 40;
|
||||
int points_y = 40;
|
||||
float offset_x = 74;
|
||||
float offset_y = 33;
|
||||
|
||||
if (code_seen('X')) dimension_x = code_value();
|
||||
if (code_seen('Y')) dimension_y = code_value();
|
||||
if (code_seen("XP")) { strchr_pointer+=1; points_x = code_value(); }
|
||||
if (code_seen("YP")) { strchr_pointer+=1; points_y = code_value(); }
|
||||
if (code_seen("XO")) { strchr_pointer+=1; offset_x = code_value(); }
|
||||
if (code_seen("YO")) { strchr_pointer+=1; offset_y = code_value(); }
|
||||
|
||||
bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
|
||||
|
||||
} break;
|
||||
|
||||
#endif
|
||||
|
||||
case 79: {
|
||||
for (int i = 255; i > 0; i = i - 5) {
|
||||
fanSpeed = i;
|
||||
//delay_keep_alive(2000);
|
||||
for (int j = 0; j < 100; j++) {
|
||||
delay_keep_alive(100);
|
||||
|
||||
}
|
||||
printf_P(_N("%d: %d\n"), i, fan_speed[1]);
|
||||
}
|
||||
}break;
|
||||
|
||||
/**
|
||||
* G80: Mesh-based Z probe, probes a grid and produces a
|
||||
@ -5792,7 +5750,6 @@ Sigma_Exit:
|
||||
if (code_seen('N'))
|
||||
gcode_LastN = code_value_long();
|
||||
break;
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
case 113: // M113 - Get or set Host Keepalive interval
|
||||
if (code_seen('S')) {
|
||||
host_keepalive_interval = (uint8_t)code_value_short();
|
||||
@ -5804,7 +5761,6 @@ Sigma_Exit:
|
||||
SERIAL_PROTOCOLLN("");
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case 115: // M115
|
||||
if (code_seen('V')) {
|
||||
// Report the Prusa version number.
|
||||
@ -7138,7 +7094,66 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
|
||||
dcode_9(); break;
|
||||
case 10: //! D10 - XYZ calibration = OK
|
||||
dcode_10(); break;
|
||||
|
||||
#endif //DEBUG_DCODES
|
||||
#ifdef HEATBED_ANALYSIS
|
||||
case 80:
|
||||
{
|
||||
float dimension_x = 40;
|
||||
float dimension_y = 40;
|
||||
int points_x = 40;
|
||||
int points_y = 40;
|
||||
float offset_x = 74;
|
||||
float offset_y = 33;
|
||||
|
||||
if (code_seen('E')) dimension_x = code_value();
|
||||
if (code_seen('F')) dimension_y = code_value();
|
||||
if (code_seen('G')) {points_x = code_value(); }
|
||||
if (code_seen('H')) {points_y = code_value(); }
|
||||
if (code_seen('I')) {offset_x = code_value(); }
|
||||
if (code_seen('J')) {offset_y = code_value(); }
|
||||
printf_P(PSTR("DIM X: %f\n"), dimension_x);
|
||||
printf_P(PSTR("DIM Y: %f\n"), dimension_y);
|
||||
printf_P(PSTR("POINTS X: %d\n"), points_x);
|
||||
printf_P(PSTR("POINTS Y: %d\n"), points_y);
|
||||
printf_P(PSTR("OFFSET X: %f\n"), offset_x);
|
||||
printf_P(PSTR("OFFSET Y: %f\n"), offset_y);
|
||||
bed_check(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
|
||||
}break;
|
||||
|
||||
case 81:
|
||||
{
|
||||
float dimension_x = 40;
|
||||
float dimension_y = 40;
|
||||
int points_x = 40;
|
||||
int points_y = 40;
|
||||
float offset_x = 74;
|
||||
float offset_y = 33;
|
||||
|
||||
if (code_seen('E')) dimension_x = code_value();
|
||||
if (code_seen('F')) dimension_y = code_value();
|
||||
if (code_seen("G")) { strchr_pointer+=1; points_x = code_value(); }
|
||||
if (code_seen("H")) { strchr_pointer+=1; points_y = code_value(); }
|
||||
if (code_seen("I")) { strchr_pointer+=1; offset_x = code_value(); }
|
||||
if (code_seen("J")) { strchr_pointer+=1; offset_y = code_value(); }
|
||||
|
||||
bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
|
||||
|
||||
} break;
|
||||
|
||||
#endif //HEATBED_ANALYSIS
|
||||
#ifdef DEBUG_DCODES
|
||||
case 106: //D106 print measured fan speed for different pwm values
|
||||
{
|
||||
for (int i = 255; i > 0; i = i - 5) {
|
||||
fanSpeed = i;
|
||||
//delay_keep_alive(2000);
|
||||
for (int j = 0; j < 100; j++) {
|
||||
delay_keep_alive(100);
|
||||
|
||||
}
|
||||
printf_P(_N("%d: %d\n"), i, fan_speed[1]);
|
||||
}
|
||||
}break;
|
||||
|
||||
#ifdef TMC2130
|
||||
case 2130: //! D2130 - TMC2130
|
||||
@ -7934,7 +7949,7 @@ void check_babystep()
|
||||
lcd_update_enable(true);
|
||||
}
|
||||
}
|
||||
#ifdef DIS
|
||||
#ifdef HEATBED_ANALYSIS
|
||||
void d_setup()
|
||||
{
|
||||
pinMode(D_DATACLOCK, INPUT_PULLUP);
|
||||
@ -7984,6 +7999,199 @@ float d_ReadData()
|
||||
|
||||
}
|
||||
|
||||
void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y) {
|
||||
int t1 = 0;
|
||||
int t_delay = 0;
|
||||
int digit[13];
|
||||
int m;
|
||||
char str[3];
|
||||
//String mergeOutput;
|
||||
char mergeOutput[15];
|
||||
float output;
|
||||
|
||||
int mesh_point = 0; //index number of calibration point
|
||||
float bed_zero_ref_x = (-22.f + X_PROBE_OFFSET_FROM_EXTRUDER); //shift between zero point on bed and target and between probe and nozzle
|
||||
float bed_zero_ref_y = (-0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER);
|
||||
|
||||
float mesh_home_z_search = 4;
|
||||
float measure_z_heigth = 0.2f;
|
||||
float row[x_points_num];
|
||||
int ix = 0;
|
||||
int iy = 0;
|
||||
|
||||
const char* filename_wldsd = "mesh.txt";
|
||||
char data_wldsd[x_points_num * 7 + 1]; //6 chars(" -A.BCD")for each measurement + null
|
||||
char numb_wldsd[8]; // (" -A.BCD" + null)
|
||||
#ifdef MICROMETER_LOGGING
|
||||
d_setup();
|
||||
#endif //MICROMETER_LOGGING
|
||||
|
||||
int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20;
|
||||
int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40;
|
||||
|
||||
unsigned int custom_message_type_old = custom_message_type;
|
||||
unsigned int custom_message_state_old = custom_message_state;
|
||||
custom_message_type = CUSTOM_MSG_TYPE_MESHBL;
|
||||
custom_message_state = (x_points_num * y_points_num) + 10;
|
||||
lcd_update(1);
|
||||
|
||||
//mbl.reset();
|
||||
babystep_undo();
|
||||
|
||||
card.openFile(filename_wldsd, false);
|
||||
|
||||
/*destination[Z_AXIS] = mesh_home_z_search;
|
||||
//plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
|
||||
|
||||
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
|
||||
for(int8_t i=0; i < NUM_AXIS; i++) {
|
||||
current_position[i] = destination[i];
|
||||
}
|
||||
st_synchronize();
|
||||
*/
|
||||
destination[Z_AXIS] = measure_z_heigth;
|
||||
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
|
||||
for(int8_t i=0; i < NUM_AXIS; i++) {
|
||||
current_position[i] = destination[i];
|
||||
}
|
||||
st_synchronize();
|
||||
/*int l_feedmultiply = */setup_for_endstop_move(false);
|
||||
|
||||
SERIAL_PROTOCOLPGM("Num X,Y: ");
|
||||
SERIAL_PROTOCOL(x_points_num);
|
||||
SERIAL_PROTOCOLPGM(",");
|
||||
SERIAL_PROTOCOL(y_points_num);
|
||||
SERIAL_PROTOCOLPGM("\nZ search height: ");
|
||||
SERIAL_PROTOCOL(mesh_home_z_search);
|
||||
SERIAL_PROTOCOLPGM("\nDimension X,Y: ");
|
||||
SERIAL_PROTOCOL(x_dimension);
|
||||
SERIAL_PROTOCOLPGM(",");
|
||||
SERIAL_PROTOCOL(y_dimension);
|
||||
SERIAL_PROTOCOLLNPGM("\nMeasured points:");
|
||||
|
||||
while (mesh_point != x_points_num * y_points_num) {
|
||||
ix = mesh_point % x_points_num; // from 0 to MESH_NUM_X_POINTS - 1
|
||||
iy = mesh_point / x_points_num;
|
||||
if (iy & 1) ix = (x_points_num - 1) - ix; // Zig zag
|
||||
float z0 = 0.f;
|
||||
/*destination[Z_AXIS] = mesh_home_z_search;
|
||||
//plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
|
||||
|
||||
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder);
|
||||
for(int8_t i=0; i < NUM_AXIS; i++) {
|
||||
current_position[i] = destination[i];
|
||||
}
|
||||
st_synchronize();*/
|
||||
|
||||
|
||||
//current_position[X_AXIS] = 13.f + ix * (x_dimension / (x_points_num - 1)) - bed_zero_ref_x + shift_x;
|
||||
//current_position[Y_AXIS] = 6.4f + iy * (y_dimension / (y_points_num - 1)) - bed_zero_ref_y + shift_y;
|
||||
|
||||
destination[X_AXIS] = ix * (x_dimension / (x_points_num - 1)) + shift_x;
|
||||
destination[Y_AXIS] = iy * (y_dimension / (y_points_num - 1)) + shift_y;
|
||||
|
||||
mesh_plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], XY_AXIS_FEEDRATE/6, active_extruder);
|
||||
for(int8_t i=0; i < NUM_AXIS; i++) {
|
||||
current_position[i] = destination[i];
|
||||
}
|
||||
st_synchronize();
|
||||
|
||||
// printf_P(PSTR("X = %f; Y= %f \n"), current_position[X_AXIS], current_position[Y_AXIS]);
|
||||
|
||||
delay_keep_alive(1000);
|
||||
#ifdef MICROMETER_LOGGING
|
||||
|
||||
//memset(numb_wldsd, 0, sizeof(numb_wldsd));
|
||||
//dtostrf(d_ReadData(), 8, 5, numb_wldsd);
|
||||
//strcat(data_wldsd, numb_wldsd);
|
||||
|
||||
|
||||
|
||||
//MYSERIAL.println(data_wldsd);
|
||||
//delay(1000);
|
||||
//delay(3000);
|
||||
//t1 = millis();
|
||||
|
||||
//while (digitalRead(D_DATACLOCK) == LOW) {}
|
||||
//while (digitalRead(D_DATACLOCK) == HIGH) {}
|
||||
memset(digit, 0, sizeof(digit));
|
||||
//cli();
|
||||
digitalWrite(D_REQUIRE, LOW);
|
||||
|
||||
for (int i = 0; i<13; i++)
|
||||
{
|
||||
//t1 = millis();
|
||||
for (int j = 0; j < 4; j++)
|
||||
{
|
||||
while (digitalRead(D_DATACLOCK) == LOW) {}
|
||||
while (digitalRead(D_DATACLOCK) == HIGH) {}
|
||||
//printf_P(PSTR("Done %d\n"), j);
|
||||
bitWrite(digit[i], j, digitalRead(D_DATA));
|
||||
}
|
||||
//t_delay = (millis() - t1);
|
||||
//SERIAL_PROTOCOLPGM(" ");
|
||||
//SERIAL_PROTOCOL_F(t_delay, 5);
|
||||
//SERIAL_PROTOCOLPGM(" ");
|
||||
|
||||
}
|
||||
//sei();
|
||||
digitalWrite(D_REQUIRE, HIGH);
|
||||
mergeOutput[0] = '\0';
|
||||
output = 0;
|
||||
for (int r = 5; r <= 10; r++) //Merge digits
|
||||
{
|
||||
sprintf(str, "%d", digit[r]);
|
||||
strcat(mergeOutput, str);
|
||||
}
|
||||
|
||||
output = atof(mergeOutput);
|
||||
|
||||
if (digit[4] == 8) //Handle sign
|
||||
{
|
||||
output *= -1;
|
||||
}
|
||||
|
||||
for (int i = digit[11]; i > 0; i--) //Handle floating point
|
||||
{
|
||||
output *= 0.1;
|
||||
}
|
||||
|
||||
|
||||
//output = d_ReadData();
|
||||
|
||||
//row[ix] = current_position[Z_AXIS];
|
||||
|
||||
|
||||
|
||||
//row[ix] = d_ReadData();
|
||||
|
||||
row[ix] = output;
|
||||
|
||||
if (iy % 2 == 1 ? ix == 0 : ix == x_points_num - 1) {
|
||||
memset(data_wldsd, 0, sizeof(data_wldsd));
|
||||
for (int i = 0; i < x_points_num; i++) {
|
||||
SERIAL_PROTOCOLPGM(" ");
|
||||
SERIAL_PROTOCOL_F(row[i], 5);
|
||||
memset(numb_wldsd, 0, sizeof(numb_wldsd));
|
||||
dtostrf(row[i], 7, 3, numb_wldsd);
|
||||
strcat(data_wldsd, numb_wldsd);
|
||||
}
|
||||
card.write_command(data_wldsd);
|
||||
SERIAL_PROTOCOLPGM("\n");
|
||||
|
||||
}
|
||||
|
||||
custom_message_state--;
|
||||
mesh_point++;
|
||||
lcd_update(1);
|
||||
|
||||
}
|
||||
#endif //MICROMETER_LOGGING
|
||||
card.closefile();
|
||||
//clean_up_after_endstop_move(l_feedmultiply);
|
||||
|
||||
}
|
||||
|
||||
void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y) {
|
||||
int t1 = 0;
|
||||
int t_delay = 0;
|
||||
@ -8167,7 +8375,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_
|
||||
card.closefile();
|
||||
clean_up_after_endstop_move(l_feedmultiply);
|
||||
}
|
||||
#endif
|
||||
#endif //HEATBED_ANALYSIS
|
||||
|
||||
void temp_compensation_start() {
|
||||
|
||||
|
||||
@ -14,6 +14,12 @@
|
||||
#define SWI2C_SDA 20 //SDA on P3
|
||||
#define SWI2C_SCL 21 //SCL on P3
|
||||
|
||||
#ifdef MICROMETER_LOGGING
|
||||
#define D_DATACLOCK 24 //Y_MAX (green)
|
||||
#define D_DATA 30 //X_MAX (blue)
|
||||
#define D_REQUIRE 23 //Z_MAX (white)
|
||||
#endif //MICROMETER_LOGGING
|
||||
|
||||
|
||||
|
||||
#define X_STEP_PIN 37
|
||||
|
||||
@ -888,9 +888,7 @@ void manage_heater()
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef HOST_KEEPALIVE_FEATURE
|
||||
host_keepalive();
|
||||
#endif
|
||||
}
|
||||
|
||||
#define PGM_RD_W(x) (short)pgm_read_word(&x)
|
||||
|
||||
@ -504,4 +504,7 @@
|
||||
|
||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||
|
||||
//#define HEATBED_ANALYSIS //for meash bed leveling and heatbed analysis D-codes D80 and D81
|
||||
//#define MICROMETER_LOGGING //related to D-codes D80 and D81, currently works on MK2.5 only (MK3 board pin definitions missing)
|
||||
|
||||
#endif //__CONFIGURATION_PRUSA_H
|
||||
|
||||
Loading…
Reference in New Issue
Block a user