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

Typo: meassure -> measure

This commit is contained in:
Yuri D'Elia 2022-12-21 13:15:35 +01:00 committed by DRracer
parent 52941b1111
commit b3790f4094
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Firmware/tmc2130.cpp
View File

@ -45,9 +45,9 @@ uint8_t tmc2130_sg_homing_axes_mask = 0x00;
const char eMotorCurrentScalingEnabled[] PROGMEM = "E-motor current scaling enabled";
uint8_t tmc2130_sg_meassure = 0xff;
uint32_t tmc2130_sg_meassure_cnt = 0;
uint32_t tmc2130_sg_meassure_val = 0;
uint8_t tmc2130_sg_measure = 0xff;
uint32_t tmc2130_sg_measure_cnt = 0;
uint32_t tmc2130_sg_measure_val = 0;
uint8_t tmc2130_home_enabled = 0;
uint8_t tmc2130_home_origin[2] = {0, 0};
@ -252,12 +252,12 @@ void tmc2130_st_isr()
bool tmc2130_update_sg()
{
if (tmc2130_sg_meassure <= E_AXIS)
if (tmc2130_sg_measure <= E_AXIS)
{
uint32_t val32 = 0;
tmc2130_rd(tmc2130_sg_meassure, TMC2130_REG_DRV_STATUS, &val32);
tmc2130_sg_meassure_val += (val32 & 0x3ff);
tmc2130_sg_meassure_cnt++;
tmc2130_rd(tmc2130_sg_measure, TMC2130_REG_DRV_STATUS, &val32);
tmc2130_sg_measure_val += (val32 & 0x3ff);
tmc2130_sg_measure_cnt++;
return true;
}
return false;
@ -326,17 +326,17 @@ void tmc2130_home_exit()
#endif
}
void tmc2130_sg_meassure_start(uint8_t axis)
void tmc2130_sg_measure_start(uint8_t axis)
{
tmc2130_sg_meassure = axis;
tmc2130_sg_meassure_cnt = 0;
tmc2130_sg_meassure_val = 0;
tmc2130_sg_measure = axis;
tmc2130_sg_measure_cnt = 0;
tmc2130_sg_measure_val = 0;
}
uint16_t tmc2130_sg_meassure_stop()
uint16_t tmc2130_sg_measure_stop()
{
tmc2130_sg_meassure = 0xff;
return tmc2130_sg_meassure_val / tmc2130_sg_meassure_cnt;
tmc2130_sg_measure = 0xff;
return tmc2130_sg_measure_val / tmc2130_sg_measure_cnt;
}

10
Firmware/tmc2130.h
View File

@ -16,9 +16,9 @@ extern uint8_t tmc2130_sg_thr[4];
extern bool tmc2130_sg_stop_on_crash;
extern uint8_t tmc2130_sg_crash; //crash mask
extern uint8_t tmc2130_sg_meassure;
extern uint32_t tmc2130_sg_meassure_cnt;
extern uint32_t tmc2130_sg_meassure_val;
extern uint8_t tmc2130_sg_measure;
extern uint32_t tmc2130_sg_measure_cnt;
extern uint32_t tmc2130_sg_measure_val;
extern uint8_t tmc2130_sg_homing_axes_mask;
@ -94,9 +94,9 @@ extern void tmc2130_home_enter(uint8_t axes_mask);
extern void tmc2130_home_exit();
//start stallguard meassuring for single axis
extern void tmc2130_sg_meassure_start(uint8_t axis);
extern void tmc2130_sg_measure_start(uint8_t axis);
//stop current stallguard meassuring and report result
extern uint16_t tmc2130_sg_meassure_stop();
extern uint16_t tmc2130_sg_measure_stop();
extern void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r);

6
Firmware/ultralcd.cpp
View File

@ -1830,7 +1830,7 @@ void lcd_set_filament_autoload() {
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
void lcd_set_filament_oq_meass()
{
fsensor_oq_meassure_set(!fsensor_oq_meassure_enabled);
fsensor_oq_measure_set(!fsensor_oq_measure_enabled);
}
#endif
@ -6524,7 +6524,7 @@ static bool lcd_selfcheck_axis_sg(uint8_t axis) {
st_synchronize();
tmc2130_sg_meassure_start(axis);
tmc2130_sg_measure_start(axis);
current_position_init = st_get_position_mm(axis);
@ -6537,7 +6537,7 @@ static bool lcd_selfcheck_axis_sg(uint8_t axis) {
st_synchronize();
uint16_t sg1 = tmc2130_sg_meassure_stop();
uint16_t sg1 = tmc2130_sg_measure_stop();
printf_P(PSTR("%c AXIS SG1=%d\n"), 'X'+axis, sg1);
eeprom_write_word(((uint16_t*)((axis == X_AXIS)?EEPROM_BELTSTATUS_X:EEPROM_BELTSTATUS_Y)), sg1);

16
Firmware/xyzcal.cpp
View File

@ -135,9 +135,9 @@ pos_mm_t pos_2_mm(float pos){
return pos * 0.01f;
}
void xyzcal_meassure_enter(void)
void xyzcal_measure_enter(void)
{
DBG(_n("xyzcal_meassure_enter\n"));
DBG(_n("xyzcal_measure_enter\n"));
lcd_puts_at_P(4,3,PSTR("Measure center ")); ////MSG_MEASURE_CENTER c=16
// disable heaters and stop motion before we initialize sm4
disable_heater();
@ -155,9 +155,9 @@ void xyzcal_meassure_enter(void)
sm4_calc_delay_cb = xyzcal_calc_delay;
}
void xyzcal_meassure_leave(void)
void xyzcal_measure_leave(void)
{
DBG(_n("xyzcal_meassure_leave\n"));
DBG(_n("xyzcal_measure_leave\n"));
lcd_set_cursor(4,3);
lcd_space(16);
@ -344,7 +344,7 @@ bool xyzcal_spiral8(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi
return ret;
}
#ifdef XYZCAL_MEASSURE_PINDA_HYSTERESIS
#ifdef XYZCAL_MEASURE_PINDA_HYSTERESIS
int8_t xyzcal_measure_pinda_hysteresis(int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t samples)
{
DBG(_n("xyzcal_measure_pinda_hysteresis\n"));
@ -392,7 +392,7 @@ int8_t xyzcal_measure_pinda_hysteresis(int16_t min_z, int16_t max_z, uint16_t de
xyzcal_lineXYZ_to(_X, _Y, z, delay_us, 0);
return ret;
}
#endif //XYZCAL_MEASSURE_PINDA_HYSTERESIS
#endif //XYZCAL_MEASURE_PINDA_HYSTERESIS
void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){
int16_t delay_us = 600;
@ -1006,10 +1006,10 @@ BedSkewOffsetDetectionResultType xyzcal_scan_and_process(){
BedSkewOffsetDetectionResultType xyzcal_find_bed_induction_sensor_point_xy(void) {
// DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]);
BedSkewOffsetDetectionResultType ret = BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND;
xyzcal_meassure_enter();
xyzcal_measure_enter();
if (xyzcal_searchZ())
ret = xyzcal_scan_and_process();
xyzcal_meassure_leave();
xyzcal_measure_leave();
return ret;
}

4
Firmware/xyzcal.h
View File

@ -5,8 +5,8 @@
#include "mesh_bed_calibration.h"
extern void xyzcal_meassure_enter(void);
extern void xyzcal_meassure_leave(void);
extern void xyzcal_measure_enter(void);
extern void xyzcal_measure_leave(void);
extern bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_t check_pinda);