zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6453 from thinkyhead/rc_cleanup_wednesday

Browse source 
Minor cleanups, work-in-progress
This commit is contained in:
Scott Lahteine 2017-04-26 19:41:52 -05:00 committed by GitHub
parent 22f6e277af adb8e68592
commit 817ecb9ff4
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View file

@ -616,12 +616,12 @@ static uint8_t target_extruder;
float cartes[XYZ] = { 0 }; float cartes[XYZ] = { 0 };
#if ENABLED(FILAMENT_WIDTH_SENSOR) #if ENABLED(FILAMENT_WIDTH_SENSOR)
bool filament_sensor = false; //M405 turns on filament_sensor control, M406 turns it off bool filament_sensor = false; // M405 turns on filament sensor control. M406 turns it off.
float filament_width_nominal = DEFAULT_NOMINAL_FILAMENT_DIA, // Nominal filament width. Change with M404 float filament_width_nominal = DEFAULT_NOMINAL_FILAMENT_DIA, // Nominal filament width. Change with M404.
filament_width_meas = DEFAULT_MEASURED_FILAMENT_DIA; // Measured filament diameter filament_width_meas = DEFAULT_MEASURED_FILAMENT_DIA; // Measured filament diameter
int8_t measurement_delay[MAX_MEASUREMENT_DELAY + 1]; // Ring buffer to delayed measurement. Store extruder factor after subtracting 100 int8_t measurement_delay[MAX_MEASUREMENT_DELAY + 1]; // Ring buffer to delayed measurement. Store extruder factor after subtracting 100
int filwidth_delay_index[2] = { 0, -1 }; // Indexes into ring buffer int filwidth_delay_index[2] = { 0, -1 }; // Indexes into ring buffer
int meas_delay_cm = MEASUREMENT_DELAY_CM; //distance delay setting int meas_delay_cm = MEASUREMENT_DELAY_CM; // Distance delay setting
#endif #endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
@ -8220,10 +8220,10 @@ inline void gcode_M400() { stepper.synchronize(); }
NOMORE(meas_delay_cm, MAX_MEASUREMENT_DELAY); NOMORE(meas_delay_cm, MAX_MEASUREMENT_DELAY);
if (filwidth_delay_index[1] == -1) { // Initialize the ring buffer if not done since startup if (filwidth_delay_index[1] == -1) { // Initialize the ring buffer if not done since startup
int temp_ratio = thermalManager.widthFil_to_size_ratio(); const int temp_ratio = thermalManager.widthFil_to_size_ratio() - 100; // -100 to scale within a signed byte
for (uint8_t i = 0; i < COUNT(measurement_delay); ++i) for (uint8_t i = 0; i < COUNT(measurement_delay); ++i)
measurement_delay[i] = temp_ratio - 100; // Subtract 100 to scale within a signed byte measurement_delay[i] = temp_ratio;
filwidth_delay_index[0] = filwidth_delay_index[1] = 0; filwidth_delay_index[0] = filwidth_delay_index[1] = 0;
} }
@ -10279,7 +10279,7 @@ void process_next_command() {
case 407: // M407: Display measured filament diameter case 407: // M407: Display measured filament diameter
gcode_M407(); gcode_M407();
break; break;
#endif // ENABLED(FILAMENT_WIDTH_SENSOR) #endif // FILAMENT_WIDTH_SENSOR
#if PLANNER_LEVELING #if PLANNER_LEVELING
case 420: // M420: Enable/Disable Bed Leveling case 420: // M420: Enable/Disable Bed Leveling

3
Marlin/printcounter.cpp
View file

@ -188,7 +188,8 @@ bool PrintCounter::start() {
} }
return true; return true;
} }
else return false;
return false;
} }
// @Override // @Override

4
Marlin/printcounter.h
View file

@ -32,12 +32,12 @@
// Print debug messages with M111 S2 // Print debug messages with M111 S2
//#define DEBUG_PRINTCOUNTER //#define DEBUG_PRINTCOUNTER
struct printStatistics { // 13 bytes struct printStatistics { // 16 bytes (20 with real doubles)
//const uint8_t magic; // Magic header, it will always be 0x16 //const uint8_t magic; // Magic header, it will always be 0x16
uint16_t totalPrints; // Number of prints uint16_t totalPrints; // Number of prints
uint16_t finishedPrints; // Number of complete prints uint16_t finishedPrints; // Number of complete prints
uint32_t printTime; // Accumulated printing time uint32_t printTime; // Accumulated printing time
uint32_t longestPrint; // Longest successfull print job uint32_t longestPrint; // Longest successful print job
double filamentUsed; // Accumulated filament consumed in mm double filamentUsed; // Accumulated filament consumed in mm
}; };

13
Marlin/temperature.cpp
View file

@ -766,15 +766,14 @@ void Temperature::manage_heater() {
if (filament_sensor) { if (filament_sensor) {
meas_shift_index = filwidth_delay_index[0] - meas_delay_cm; meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1; //loop around buffer if needed if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1; //loop around buffer if needed
meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY);
// Get the delayed info and add 100 to reconstitute to a percent of // Get the delayed info and add 100 to reconstitute to a percent of
// the nominal filament diameter then square it to get an area // the nominal filament diameter then square it to get an area
meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY); const float vmroot = measurement_delay[meas_shift_index] * 0.01 + 1.0;
float vm = pow((measurement_delay[meas_shift_index] + 100.0) * 0.01, 2); volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM] = vmroot <= 0.1 ? 0.01 : sq(vmroot);
NOLESS(vm, 0.01);
volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM] = vm;
} }
#endif //FILAMENT_WIDTH_SENSOR #endif // FILAMENT_WIDTH_SENSOR
#if DISABLED(PIDTEMPBED) #if DISABLED(PIDTEMPBED)
if (PENDING(ms, next_bed_check_ms)) return; if (PENDING(ms, next_bed_check_ms)) return;
@ -961,8 +960,8 @@ void Temperature::updateTemperaturesFromRawValues() {
*/ */
void Temperature::init() { void Temperature::init() {
#if MB(RUMBA) && ((TEMP_SENSOR_0==-1)||(TEMP_SENSOR_1==-1)||(TEMP_SENSOR_2==-1)||(TEMP_SENSOR_BED==-1)) #if MB(RUMBA) && (TEMP_SENSOR_0 == -1 || TEMP_SENSOR_1 == -1 || TEMP_SENSOR_2 == -1 || TEMP_SENSOR_BED == -1)
//disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
MCUCR = _BV(JTD); MCUCR = _BV(JTD);
MCUCR = _BV(JTD); MCUCR = _BV(JTD);
#endif #endif

2
Marlin/ultralcd.cpp
View file

@ -705,7 +705,7 @@ void kill_screen(const char* lcd_msg) {
thermalManager.autotempShutdown(); thermalManager.autotempShutdown();
#endif #endif
wait_for_heatup = false; wait_for_heatup = false;
lcd_setstatuspgm(PSTR(MSG_PRINT_ABORTED), true); LCD_MESSAGEPGM(MSG_PRINT_ABORTED);
} }
#endif // SDSUPPORT #endif // SDSUPPORT