zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3784 from thinkyhead/rc_funcs_not_extern

Browse source 
Function declarations in headers don't need "extern"
This commit is contained in:
Scott Lahteine 2016-05-17 18:43:25 -07:00
parent 82c2d308dc 4041508ffb
commit 3bdc03667e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/Marlin.h
View file

@ -278,10 +278,10 @@ extern bool axis_known_position[3]; // axis[n].is_known
extern bool axis_homed[3]; // axis[n].is_homed extern bool axis_homed[3]; // axis[n].is_homed
// GCode support for external objects // GCode support for external objects
extern bool code_seen(char); bool code_seen(char);
extern float code_value(); float code_value();
extern long code_value_long(); long code_value_long();
extern int16_t code_value_short(); int16_t code_value_short();
#if ENABLED(DELTA) #if ENABLED(DELTA)
extern float delta[3]; extern float delta[3];
@ -355,15 +355,10 @@ extern int16_t code_value_short();
// Handling multiple extruders pins // Handling multiple extruders pins
extern uint8_t active_extruder; extern uint8_t active_extruder;
#if ENABLED(DIGIPOT_I2C)
extern void digipot_i2c_set_current(int channel, float current);
extern void digipot_i2c_init();
#endif
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_HOTEND || HAS_TEMP_BED
void print_heaterstates(); void print_heaterstates();
#endif #endif
extern void calculate_volumetric_multipliers(); void calculate_volumetric_multipliers();
#endif //MARLIN_H #endif //MARLIN_H

5
Marlin/Marlin_main.cpp
View file

@ -576,6 +576,11 @@ extern "C" {
} }
#endif //!SDSUPPORT #endif //!SDSUPPORT
#if ENABLED(DIGIPOT_I2C)
extern void digipot_i2c_set_current(int channel, float current);
extern void digipot_i2c_init();
#endif
/** /**
* Inject the next "immediate" command, when possible. * Inject the next "immediate" command, when possible.
* Return true if any immediate commands remain to inject. * Return true if any immediate commands remain to inject.