More IntelliSense-friendly declarations

This commit is contained in:
Scott Lahteine
2021-03-24 05:40:28 -05:00
committed by Scott Lahteine
parent da4b6896f7
commit 2d2291d00e
32 changed files with 562 additions and 203 deletions

View File

@@ -55,22 +55,38 @@ typedef struct {
float zraise;
// Repeat information
TERN_(GCODE_REPEAT_MARKERS, Repeat stored_repeat);
#if ENABLED(GCODE_REPEAT_MARKERS)
Repeat stored_repeat;
#endif
TERN_(HAS_HOME_OFFSET, xyz_pos_t home_offset);
TERN_(HAS_POSITION_SHIFT, xyz_pos_t position_shift);
TERN_(HAS_MULTI_EXTRUDER, uint8_t active_extruder);
#if ENABLED(HAS_HOME_OFFSET)
xyz_pos_t home_offset;
#endif
#if ENABLED(HAS_POSITION_SHIFT)
xyz_pos_t position_shift;
#endif
#if ENABLED(HAS_MULTI_EXTRUDER)
uint8_t active_extruder;
#endif
#if DISABLED(NO_VOLUMETRICS)
bool volumetric_enabled;
float filament_size[EXTRUDERS];
#endif
TERN_(HAS_HOTEND, celsius_t target_temperature[HOTENDS]);
TERN_(HAS_HEATED_BED, celsius_t target_temperature_bed);
TERN_(HAS_FAN, uint8_t fan_speed[FAN_COUNT]);
#if ENABLED(HAS_HOTEND)
celsius_t target_temperature[HOTENDS];
#endif
#if ENABLED(HAS_HEATED_BED)
celsius_t target_temperature_bed;
#endif
#if ENABLED(HAS_FAN)
uint8_t fan_speed[FAN_COUNT];
#endif
TERN_(HAS_LEVELING, float fade);
#if ENABLED(HAS_LEVELING)
float fade;
#endif
#if ENABLED(FWRETRACT)
float retract[EXTRUDERS], retract_hop;
@@ -80,7 +96,9 @@ typedef struct {
#if ENABLED(MIXING_EXTRUDER)
//uint_fast8_t selected_vtool;
//mixer_comp_t color[NR_MIXING_VIRTUAL_TOOLS][MIXING_STEPPERS];
TERN_(GRADIENT_MIX, gradient_t gradient);
#if ENABLED(GRADIENT_MIX)
gradient_t gradient;
#endif
#endif
// SD Filename and position
@@ -97,7 +115,9 @@ typedef struct {
struct {
bool dryrun:1; // M111 S8
bool allow_cold_extrusion:1; // M302 P1
TERN_(HAS_LEVELING, bool leveling:1);
#if ENABLED(HAS_LEVELING)
bool leveling:1;
#endif
} flag;
uint8_t valid_foot;