josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comments added

This commit is contained in:
PavelSindler 2017-06-29 13:32:17 +02:00
parent 5e63c5ed85
commit 1d561601c7
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View File

@ -2540,7 +2540,7 @@ void process_commands()
// and correct the current_position to match the transformed coordinate system. // and correct the current_position to match the transformed coordinate system.
world2machine_update_current(); world2machine_update_current();
#if (defined(MESH_BED_LEVELING) && !defined(MK1BP)) #if (defined(MESH_BED_LEVELING) && !defined(MK1BP))
if (code_seen(axis_codes[X_AXIS]) || code_seen(axis_codes[Y_AXIS]) || code_seen('W') || code_seen(axis_codes[Z_AXIS])) if (code_seen(axis_codes[X_AXIS]) || code_seen(axis_codes[Y_AXIS]) || code_seen('W') || code_seen(axis_codes[Z_AXIS]))
{ {
} }
@ -2930,9 +2930,9 @@ void process_commands()
*/ */
case 80: case 80:
#ifdef MK1BP #ifdef MK1BP
break; break;
#endif //MK1BP #endif //MK1BP
case_G80: case_G80:
{ {
mesh_bed_leveling_flag = true; mesh_bed_leveling_flag = true;
@ -6602,4 +6602,4 @@ void serialecho_temperatures() {
SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOLPGM(" B:");
SERIAL_PROTOCOL_F(degBed(), 1); SERIAL_PROTOCOL_F(degBed(), 1);
SERIAL_PROTOCOLLN(""); SERIAL_PROTOCOLLN("");
} }

5
Firmware/mesh_bed_calibration.cpp
View File

@ -2448,7 +2448,12 @@ void count_xyz_details() {
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y + 4)) eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y + 4))
}; };
a2 = -1 * asin(vec_y[0] / MACHINE_AXIS_SCALE_Y); a2 = -1 * asin(vec_y[0] / MACHINE_AXIS_SCALE_Y);
/* SERIAL_ECHOLNPGM("par:");
MYSERIAL.println(vec_y[0]);
MYSERIAL.println(a2);*/
a1 = asin(vec_x[1] / MACHINE_AXIS_SCALE_X); a1 = asin(vec_x[1] / MACHINE_AXIS_SCALE_X);
/* MYSERIAL.println(vec_x[1]);
MYSERIAL.println(a1);*/
angleDiff = fabs(a2 - a1); angleDiff = fabs(a2 - a1);
for (uint8_t mesh_point = 0; mesh_point < 3; ++mesh_point) { for (uint8_t mesh_point = 0; mesh_point < 3; ++mesh_point) {
float y = vec_x[1] * pgm_read_float(bed_ref_points + mesh_point * 2) + vec_y[1] * pgm_read_float(bed_ref_points + mesh_point * 2 + 1) + cntr[1]; float y = vec_x[1] * pgm_read_float(bed_ref_points + mesh_point * 2) + vec_y[1] * pgm_read_float(bed_ref_points + mesh_point * 2 + 1) + cntr[1];

9
Firmware/temperature.cpp
View File

@ -1074,7 +1074,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
static int __preheat_counter[2] = { 0,0}; static int __preheat_counter[2] = { 0,0};
static int __preheat_errors[2] = { 0,0}; static int __preheat_errors[2] = { 0,0};
#ifdef TEMP_RUNAWAY_BED_TIMEOUT #ifdef TEMP_RUNAWAY_BED_TIMEOUT
if (_isbed) if (_isbed)
{ {
@ -1121,11 +1121,14 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren
if (_current_temperature < ((_isbed) ? (0.8 * _target_temperature) : 150)) //check only in area where temperature is changing fastly for heater, check to 0.8 x target temperature for bed if (_current_temperature < ((_isbed) ? (0.8 * _target_temperature) : 150)) //check only in area where temperature is changing fastly for heater, check to 0.8 x target temperature for bed
{ {
__preheat_counter[_heater_id]++; __preheat_counter[_heater_id]++;
//SERIAL_ECHOPGM("counter[0]:"); MYSERIAL.println(__preheat_counter[0]);
//SERIAL_ECHOPGM("counter[1]:"); MYSERIAL.println(__preheat_counter[1]);
//SERIAL_ECHOPGM("_isbed"); MYSERIAL.println(_isbed);
if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes
{ {
/*SERIAL_ECHOPGM("Heater:"); /*SERIAL_ECHOLNPGM("Heater:");
MYSERIAL.print(_heater_id); MYSERIAL.print(_heater_id);
SERIAL_ECHOPGM(" T:"); SERIAL_ECHOPGM(" Current temperature:");
MYSERIAL.print(_current_temperature); MYSERIAL.print(_current_temperature);
SERIAL_ECHOPGM(" Tstart:"); SERIAL_ECHOPGM(" Tstart:");
MYSERIAL.print(__preheat_start[_heater_id]);*/ MYSERIAL.print(__preheat_start[_heater_id]);*/