3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'MK3_M115_Capabilities_report' into MK3_AUTO_REPORT_TEMPERATURES

Browse source
This commit is contained in:
Voinea Dragos 2020-09-15 13:39:00 +03:00
commit a1dfbffedb
19 changed files with 190 additions and 484 deletions

28
Firmware/Marlin_main.cpp
View file

@ -47,7 +47,9 @@
#include "Configuration.h"
#include "Marlin.h"
#include "config.h"
#include "macros.h"
#ifdef ENABLE_AUTO_BED_LEVELING
#include "vector_3.h"
#ifdef AUTO_BED_LEVELING_GRID
@ -137,12 +139,6 @@
#include "sound.h"
#include "cmdqueue.h"
#include "io_atmega2560.h"
// Macros for bit masks
#define BIT(b) (1<<(b))
#define TEST(n,b) (((n)&BIT(b))!=0)
#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (BIT(b))
//Macro for print fan speed
#define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms
@ -885,7 +881,7 @@ static void check_if_fw_is_on_right_printer(){
#ifdef PAT9125
//will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor
const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN));
const uint8_t ir_detected = !READ(IR_SENSOR_PIN);
if (ir_detected){
lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////c=20 r=3
#endif //PAT9125
@ -3512,6 +3508,17 @@ static void gcode_G92()
}
}
#ifdef EXTENDED_CAPABILITIES_REPORT
static void cap_line(const char* name, bool ena = false) {
printf_P(PSTR("Cap:%S:%c\n"), name, (char)ena + '0');
}
static void extended_capabilities_report()
{
//@todo
}
#endif //EXTENDED_CAPABILITIES_REPORT
#ifdef BACKLASH_X
extern uint8_t st_backlash_x;
@ -6845,6 +6852,11 @@ Sigma_Exit:
SERIAL_ECHOPGM(" UUID:");
SERIAL_ECHOLNPGM(MACHINE_UUID);
}
#ifdef EXTENDED_CAPABILITIES_REPORT
extended_capabilities_report();
#endif //EXTENDED_CAPABILITIES_REPORT
break;
/*!