jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Tweaks

Browse Source
This commit is contained in:
InsanityAutomation
2018-09-28 20:52:27 -04:00
parent 1b677713e9
commit d407c5a91a
2 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration_adv.h
+8 -8
View File
@@ -90,21 +90,21 @@
* and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
* below 2.
*/
#define WATCH_TEMP_PERIOD 20 // Seconds
#define WATCH_TEMP_INCREASE 2 // Degrees Celsius
#define WATCH_TEMP_PERIOD 40 // Seconds
#define WATCH_TEMP_INCREASE 4 // Degrees Celsius
#endif
/**
* Thermal Protection parameters for the bed are just as above for hotends.
*/
#if ENABLED(THERMAL_PROTECTION_BED)
#define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
#define THERMAL_PROTECTION_BED_PERIOD 80 // Seconds
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
/**
* As described above, except for the bed (M140/M190/M303).
*/
#define WATCH_BED_TEMP_PERIOD 60 // Seconds
#define WATCH_BED_TEMP_PERIOD 80 // Seconds
#define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
#endif
@@ -816,7 +816,7 @@
//
// G2/G3 Arc Support
//
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
//#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
#if ENABLED(ARC_SUPPORT)
#define MM_PER_ARC_SEGMENT 1 // Length of each arc segment
#define N_ARC_CORRECTION 25 // Number of intertpolated segments between corrections
@@ -1444,7 +1444,7 @@
//#define SPEED_POWER_MAX 100 // 0-100%
#endif
#if(!ENABLED(FilamentSensor))
#if(DISABLED(FilamentSensor))
#define FAN_AS_LASER
#endif
#if ENABLED(FAN_AS_LASER)
@@ -1497,7 +1497,7 @@
/**
* M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
*/
#define PINS_DEBUGGING
//#define PINS_DEBUGGING
/**
* Auto-report temperatures with M155 S<seconds>
@@ -1507,7 +1507,7 @@
/**
* Include capabilities in M115 output
*/
#define EXTENDED_CAPABILITIES_REPORT
//#define EXTENDED_CAPABILITIES_REPORT
/**
* Disable all Volumetric extrusion options
Marlin/src/module/endstops.cpp
+14 -31
View File
@@ -422,46 +422,29 @@ void _O2 Endstops::M119() {
print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
//#define FRS_COUNT (1 + PIN_EXISTS(FIL_RUNOUT2) + PIN_EXISTS(FIL_RUNOUT3) + PIN_EXISTS(FIL_RUNOUT4) + PIN_EXISTS(FIL_RUNOUT5) + PIN_EXISTS(FIL_RUNOUT6))
#define FRS_COUNT NUM_RUNOUT_SENSORS
#if NUM_RUNOUT_SENSORS == 1
print_es_state((digitalRead(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING), PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
#else
for (uint8_t i = 1; i <=
#if NUM_RUNOUT_SENSORS == 6
6
#elif NUM_RUNOUT_SENSORS == 5
5
#elif NUM_RUNOUT_SENSORS == 4
4
#elif NUM_RUNOUT_SENSORS == 3
3
#elif NUM_RUNOUT_SENSORS == 2
2
#endif
; i++
) {
for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
pin_t pin;
switch (i) {
default: continue;
case 1: pin = FIL_RUNOUT_PIN; break;
#if PIN_EXISTS(FIL_RUNOUT2)
case 2: pin = FIL_RUNOUT2_PIN; break;
#endif
#if PIN_EXISTS(FIL_RUNOUT3)
case 2: pin = FIL_RUNOUT2_PIN; break;
#if NUM_RUNOUT_SENSORS > 2
case 3: pin = FIL_RUNOUT3_PIN; break;
#endif
#if PIN_EXISTS(FIL_RUNOUT4)
case 4: pin = FIL_RUNOUT4_PIN; break;
#endif
#if PIN_EXISTS(FIL_RUNOUT5)
case 5: pin = FIL_RUNOUT5_PIN; break;
#endif
#if PIN_EXISTS(FIL_RUNOUT6)
case 6: pin = FIL_RUNOUT6_PIN; break;
#if NUM_RUNOUT_SENSORS > 3
case 4: pin = FIL_RUNOUT4_PIN; break;
#if NUM_RUNOUT_SENSORS > 4
case 5: pin = FIL_RUNOUT5_PIN; break;
#if NUM_RUNOUT_SENSORS > 5
case 6: pin = FIL_RUNOUT6_PIN; break;
#endif
#endif
#endif
#endif
}
SERIAL_PROTOCOLPGM(PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR);
if (i > 1) { SERIAL_CHAR(' '); SERIAL_CHAR('0' + i); }
print_es_state(digitalRead(pin) != FIL_RUNOUT_INVERTING);
}