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

Merge pull request #1657 from mkbel/fix_DCODES_errors

Browse Source 
Fix Dcodes compilation errors and warnings.
This commit is contained in:
MRprusa3d 2019-03-19 21:59:23 +01:00 committed by GitHub
commit 2f3c5e15ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Firmware/Dcodes.cpp
View File

@ -5,6 +5,9 @@
#include <stdio.h> #include <stdio.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#define SHOW_TEMP_ADC_VALUES
#include "temperature.h"
#define DBG(args...) printf_P(args) #define DBG(args...) printf_P(args)
@ -150,7 +153,7 @@ void dcode_3()
#include <avr/wdt.h> #include <avr/wdt.h>
#include "bootapp.h" #include "bootapp.h"
/* #if 0
#define FLASHSIZE 0x40000 #define FLASHSIZE 0x40000
#define RAMSIZE 0x2000 #define RAMSIZE 0x2000
@ -169,9 +172,10 @@ extern float current_temperature_pinda;
extern float axis_steps_per_unit[NUM_AXIS]; extern float axis_steps_per_unit[NUM_AXIS];
//#define LOG(args...) printf(args) #define LOG(args...) printf(args)
#endif //0
#define LOG(args...) #define LOG(args...)
*/
#ifdef DEBUG_DCODES #ifdef DEBUG_DCODES
void dcode__1() void dcode__1()
@ -227,7 +231,7 @@ void dcode_2()
count = parse_hex(strchr_pointer + 1, data, 16); count = parse_hex(strchr_pointer + 1, data, 16);
if (count > 0) if (count > 0)
{ {
for (int i = 0; i < count; i++) for (uint16_t i = 0; i < count; i++)
*((uint8_t*)(address + i)) = data[i]; *((uint8_t*)(address + i)) = data[i];
LOG("%d bytes written to RAM at address %04x", count, address); LOG("%d bytes written to RAM at address %04x", count, address);
} }
@ -380,7 +384,7 @@ void dcode_8()
{ {
uint16_t offs = 0; uint16_t offs = 0;
if (i > 0) offs = eeprom_read_word(((uint16_t*)EEPROM_PROBE_TEMP_SHIFT) + (i - 1)); if (i > 0) offs = eeprom_read_word(((uint16_t*)EEPROM_PROBE_TEMP_SHIFT) + (i - 1));
float foffs = ((float)offs) / axis_steps_per_unit[Z_AXIS]; float foffs = ((float)offs) / cs.axis_steps_per_unit[Z_AXIS];
offs = 1000 * foffs; offs = 1000 * foffs;
printf_P(PSTR("temp_pinda=%dC temp_shift=%dum\n"), 35 + i * 5, offs); printf_P(PSTR("temp_pinda=%dC temp_shift=%dum\n"), 35 + i * 5, offs);
} }
@ -423,10 +427,6 @@ const char* dcode_9_ADC_name(uint8_t i)
return 0; return 0;
} }
extern int current_temperature_raw[EXTRUDERS];
extern int current_temperature_bed_raw;
extern int current_temperature_raw_pinda;
#ifdef AMBIENT_THERMISTOR #ifdef AMBIENT_THERMISTOR
extern int current_temperature_raw_ambient; extern int current_temperature_raw_ambient;
#endif //AMBIENT_THERMISTOR #endif //AMBIENT_THERMISTOR
@ -606,16 +606,16 @@ void dcode_2130()
else if (strncmp(strchr_pointer + 7, "mres", 4) == 0) else if (strncmp(strchr_pointer + 7, "mres", 4) == 0)
{ {
uint8_t mres = strchr_pointer[11] - '0'; uint8_t mres = strchr_pointer[11] - '0';
if ((mres >= 0) && (mres <= 8)) if (mres <= 8)
{ {
st_synchronize(); st_synchronize();
uint16_t res = tmc2130_get_res(axis); uint16_t res = tmc2130_get_res(axis);
uint16_t res_new = tmc2130_mres2usteps(mres); uint16_t res_new = tmc2130_mres2usteps(mres);
tmc2130_set_res(axis, res_new); tmc2130_set_res(axis, res_new);
if (res_new > res) if (res_new > res)
axis_steps_per_unit[axis] *= (res_new / res); cs.axis_steps_per_unit[axis] *= (res_new / res);
else else
axis_steps_per_unit[axis] /= (res / res_new); cs.axis_steps_per_unit[axis] /= (res / res_new);
} }
} }
else if (strncmp(strchr_pointer + 7, "wave", 4) == 0) else if (strncmp(strchr_pointer + 7, "wave", 4) == 0)

2
Firmware/Marlin_main.cpp
View File

@ -7251,7 +7251,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
dcode_2130(); break; dcode_2130(); break;
#endif //TMC2130 #endif //TMC2130
#ifdef FILAMENT_SENSOR #if (defined (FILAMENT_SENSOR) && defined(PAT9125))
case 9125: //! D9125 - FILAMENT_SENSOR case 9125: //! D9125 - FILAMENT_SENSOR
dcode_9125(); break; dcode_9125(); break;
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR

2
Firmware/temperature.h
View File

@ -57,7 +57,7 @@ extern int target_temperature_bed;
extern float current_temperature_bed; extern float current_temperature_bed;
#ifdef PINDA_THERMISTOR #ifdef PINDA_THERMISTOR
//extern int current_temperature_raw_pinda; extern uint16_t current_temperature_raw_pinda;
extern float current_temperature_pinda; extern float current_temperature_pinda;
#endif #endif