bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Replace types.h with millis_t.h

Browse Source
This commit is contained in:
Scott Lahteine
2018-10-20 16:10:50 -05:00
parent eeef4e630a
commit b641571098
9 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/core/macros.h
View File

@ -193,9 +193,6 @@
#define PIN_EXISTS(PN) (defined(PN ##_PIN) && PN ##_PIN >= 0)
#define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
#define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
#define MMM_TO_MMS(MM_M) ((MM_M)/60.0f)
#define MMS_TO_MMM(MM_S) ((MM_S)*60.0f)

21
Marlin/src/core/types.h → Marlin/src/core/millis_t.h
View File

@ -22,25 +22,8 @@
#pragma once
#include <stdint.h>
#include <string.h>
typedef uint32_t millis_t;
#pragma pack(push, 1) // No padding between fields
typedef struct {
float unload_length, load_length;
} fil_change_settings_t;
typedef struct {
float retract_length, // M207 S - G10 Retract length
retract_feedrate_mm_s, // M207 F - G10 Retract feedrate
retract_zraise, // M207 Z - G10 Retract hop size
retract_recover_length, // M208 S - G11 Recover length
retract_recover_feedrate_mm_s, // M208 F - G11 Recover feedrate
swap_retract_length, // M207 W - G10 Swap Retract length
swap_retract_recover_length, // M208 W - G11 Swap Recover length
swap_retract_recover_feedrate_mm_s; // M208 R - G11 Swap Recover feedrate
} fwretract_settings_t;
#pragma pack(pop)
#define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
#define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))