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

Fix various warnings

Browse Source
This commit is contained in:
Petr Ledvina 2018-07-17 17:47:39 +02:00
parent ba8bcf76be
commit 3f17364589
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin_main.cpp
View File

@ -4196,7 +4196,6 @@ void process_commands()
delay_keep_alive(100); delay_keep_alive(100);
} }
fan_speed[1];
printf_P(_N("%d: %d\n"), i, fan_speed[1]); printf_P(_N("%d: %d\n"), i, fan_speed[1]);
} }
}break; }break;

2
Firmware/lcd.cpp
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <avr/delay.h> #include <util/delay.h>
#include "Timer.h" #include "Timer.h"
#include "Configuration.h" #include "Configuration.h"

2
Firmware/pat9125.c
View File

@ -1,6 +1,6 @@
//pat9125.c //pat9125.c
#include "pat9125.h" #include "pat9125.h"
#include <avr/delay.h> #include <util/delay.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "config.h" #include "config.h"
#include <stdio.h> #include <stdio.h>

2
Firmware/temperature.cpp
View File

@ -1473,7 +1473,7 @@ void bed_min_temp_error(void) {
} }
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
Stop(); Stop();
#endif*/ #endif
} }
#ifdef HEATER_0_USES_MAX6675 #ifdef HEATER_0_USES_MAX6675

14
Firmware/ultralcd.cpp
View File

@ -3570,11 +3570,11 @@ static void lcd_show_end_stops() {
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcd_puts_P((PSTR("End stops diag"))); lcd_puts_P((PSTR("End stops diag")));
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
lcd_puts_P((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("X1")) : (PSTR("X0"))); lcd_puts_P((READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ? (PSTR("X1")) : (PSTR("X0")));
lcd_set_cursor(0, 2); lcd_set_cursor(0, 2);
lcd_puts_P((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Y1")) : (PSTR("Y0"))); lcd_puts_P((READ(Y_MIN_PIN) ^ (bool)Y_MIN_ENDSTOP_INVERTING) ? (PSTR("Y1")) : (PSTR("Y0")));
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_puts_P((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1) ? (PSTR("Z1")) : (PSTR("Z0"))); lcd_puts_P((READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING) ? (PSTR("Z1")) : (PSTR("Z0")));
} }
static void menu_show_end_stops() { static void menu_show_end_stops() {
@ -6504,11 +6504,11 @@ static bool lcd_selfcheck_axis(int _axis, int _travel)
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder);
st_synchronize(); st_synchronize();
#ifdef TMC2130 #ifdef TMC2130
if ((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1)) if ((READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING))
#else //TMC2130 #else //TMC2130
if (((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) || if ((READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ||
((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1) || (READ(Y_MIN_PIN) ^ (bool)Y_MIN_ENDSTOP_INVERTING) ||
((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING) == 1)) (READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING))
#endif //TMC2130 #endif //TMC2130
{ {
if (_axis == 0) if (_axis == 0)

4
Firmware/uni_avr_rpi.h
View File

@ -1,5 +1,7 @@
// unification for AVR and RPI // unification for AVR and RPI
#define __AVR #ifndef __AVR
# define __AVR
#endif
#ifdef __AVR #ifdef __AVR
//#include "Arduino.h" //#include "Arduino.h"

8
Firmware/xyzcal.cpp
View File

@ -210,16 +210,16 @@ bool xyzcal_spiral8(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi
if (pad) ad = *pad; if (pad) ad = *pad;
DBG(_n("xyzcal_spiral8 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad); DBG(_n("xyzcal_spiral8 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad);
if (!ret && (ad < 720)) if (!ret && (ad < 720))
if (ret = xyzcal_spiral2(cx, cy, z0 - 0*dz, dz, radius, 0, delay_us, check_pinda, &ad)) if ((ret = xyzcal_spiral2(cx, cy, z0 - 0*dz, dz, radius, 0, delay_us, check_pinda, &ad)) != 0)
ad += 0; ad += 0;
if (!ret && (ad < 1440)) if (!ret && (ad < 1440))
if (ret = xyzcal_spiral2(cx, cy, z0 - 1*dz, dz, -radius, 0, delay_us, check_pinda, &ad)) if ((ret = xyzcal_spiral2(cx, cy, z0 - 1*dz, dz, -radius, 0, delay_us, check_pinda, &ad)) != 0)
ad += 720; ad += 720;
if (!ret && (ad < 2160)) if (!ret && (ad < 2160))
if (ret = xyzcal_spiral2(cx, cy, z0 - 2*dz, dz, radius, 180, delay_us, check_pinda, &ad)) if ((ret = xyzcal_spiral2(cx, cy, z0 - 2*dz, dz, radius, 180, delay_us, check_pinda, &ad)) != 0)
ad += 1440; ad += 1440;
if (!ret && (ad < 2880)) if (!ret && (ad < 2880))
if (ret = xyzcal_spiral2(cx, cy, z0 - 3*dz, dz, -radius, 180, delay_us, check_pinda, &ad)) if ((ret = xyzcal_spiral2(cx, cy, z0 - 3*dz, dz, -radius, 180, delay_us, check_pinda, &ad)) != 0)
ad += 2160; ad += 2160;
if (pad) *pad = ad; if (pad) *pad = ad;
return ret; return ret;