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

fix - conditional translation for DEBUG build

Browse source
This commit is contained in:
Robert Pelnar 2018-02-08 18:56:15 +01:00
parent 37f138ed3a
commit b08636c554
4 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Firmware/Configuration_prusa.h
View file

@ -101,7 +101,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored //#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored
//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored //#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored
//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored //#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored
#define DEBUG_DISABLE_STARTMSGS //no startup messages //#define DEBUG_DISABLE_STARTMSGS //no startup messages
//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored //#define DEBUG_DISABLE_MINTEMP //mintemp error ignored
//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored //#define DEBUG_DISABLE_SWLIMITS //sw limits ignored
//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line //#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line
@ -112,9 +112,9 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define DEBUG_BLINK_ACTIVE //#define DEBUG_BLINK_ACTIVE
//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) //#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled)
//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) //#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled)
#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line //#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line
#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. //#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message.
#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. //#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display.
#endif /* DEBUG_BUILD */ #endif /* DEBUG_BUILD */

17
Firmware/Dcodes.cpp
View file

@ -400,6 +400,7 @@ extern int current_temperature_raw_pinda;
extern int current_temperature_raw_ambient; extern int current_temperature_raw_ambient;
extern int current_voltage_raw_pwr; extern int current_voltage_raw_pwr;
extern int current_voltage_raw_bed; extern int current_voltage_raw_bed;
uint16_t dcode_9_ADC_val(uint8_t i) uint16_t dcode_9_ADC_val(uint8_t i)
{ {
switch (i) switch (i)
@ -408,9 +409,13 @@ uint16_t dcode_9_ADC_val(uint8_t i)
case 1: return 0; case 1: return 0;
case 2: return current_temperature_bed_raw; case 2: return current_temperature_bed_raw;
case 3: return current_temperature_raw_pinda; case 3: return current_temperature_raw_pinda;
#ifdef VOLT_PWR_PIN
case 4: return current_voltage_raw_pwr; case 4: return current_voltage_raw_pwr;
case 5: return current_temperature_raw_ambient;
case 6: return current_voltage_raw_bed; case 6: return current_voltage_raw_bed;
#endif //VOLT_PWR_PIN
#ifdef AMBIENT_THERMISTOR
case 5: return current_temperature_raw_ambient;
#endif //AMBIENT_THERMISTOR
} }
return 0; return 0;
} }
@ -454,11 +459,11 @@ void dcode_12()
eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, 0x00); eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, 0x00);
} }
#include "tmc2130.h"
#include "Marlin.h" #ifdef TMC2130
#include "planner.h" #include "planner.h"
extern void st_synchronize(); extern void st_synchronize();
#include "tmc2130.h"
void dcode_2130() void dcode_2130()
{ {
// printf("test"); // printf("test");
@ -485,7 +490,9 @@ void dcode_2130()
printf_P(PSTR("Meassure avg = %d\n"), sg); printf_P(PSTR("Meassure avg = %d\n"), sg);
} }
} }
#endif //TMC2130
#ifdef PAT9125
void dcode_9125() void dcode_9125()
{ {
LOG("D9125 - PAT9125\n"); LOG("D9125 - PAT9125\n");
@ -524,5 +531,7 @@ void dcode_9125()
LOG("fsensor_log=%d\n", fsensor_log); LOG("fsensor_log=%d\n", fsensor_log);
} }
} }
#endif //PAT9125
#endif //DEBUG_DCODES #endif //DEBUG_DCODES

6
Firmware/Dcodes.h
View file

@ -17,7 +17,13 @@ extern void dcode_9(); //D9 - Read/Write ADC (Write=enable simulated, Read=disab
extern void dcode_10(); //D10 - XYZ calibration = OK extern void dcode_10(); //D10 - XYZ calibration = OK
extern void dcode_12(); //D12 - Reset failstat counters extern void dcode_12(); //D12 - Reset failstat counters
#ifdef TMC2130
extern void dcode_2130(); //D2130 - TMC2130 extern void dcode_2130(); //D2130 - TMC2130
#endif //TMC2130
#ifdef PAT9125
extern void dcode_9125(); //D9125 - PAT9125 extern void dcode_9125(); //D9125 - PAT9125
#endif //PAT9125
#endif //DCODES_H #endif //DCODES_H

6
Firmware/Marlin_main.cpp
View file

@ -6401,10 +6401,16 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
case 12: //D12 - Reset failstat counters case 12: //D12 - Reset failstat counters
dcode_12(); break; dcode_12(); break;
#ifdef TMC2130
case 2130: // D9125 - TMC2130 case 2130: // D9125 - TMC2130
dcode_2130(); break; dcode_2130(); break;
#endif //TMC2130
#ifdef PAT9125
case 9125: // D9125 - PAT9125 case 9125: // D9125 - PAT9125
dcode_9125(); break; dcode_9125(); break;
#endif //PAT9125
} }
} }
#endif //DEBUG_DCODES #endif //DEBUG_DCODES