diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/buttons.c | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c index 5b694de42..cd7873b18 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c +++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c @@ -29,9 +29,9 @@ int PowerDown(); int PowerUp(); int thredJog(); -#define BUTTONS_SAMPLE_TIME (eTenMillisecond*50) -#define SECOND2 (BUTTONS_SAMPLE_TIME*4) -#define SECOND5 (BUTTONS_SAMPLE_TIME*10) +#define BUTTONS_SAMPLE_TIME (eHundredMillisecond) +#define SECOND2 (2000/BUTTONS_SAMPLE_TIME) +#define SECOND5 (5000/BUTTONS_SAMPLE_TIME) //enum PBstat OnOffPBstate = OFFPB; //enum PBstat ret diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h index f00ba7849..941220425 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h @@ -16,13 +16,14 @@ //void IFS_Init(void) #define SECONDS_5 5 /**< 5seconds */ #define SECONDS_300 300 /**< 300 seconds = 5 minutes */ +#define SECONDS_420 (7*60) /**< 420 seconds = 7 minutes */ #define SECONDS_600 600 /**< 600 seconds = 10 minutes */ #define SECONDS_2_DLY 0 /**< dly 0 seconds */ -#define CARTRIDGE_INK_TIMEOUT (SECONDS_300 / SECONDS_5) /**< TimeOut (5 minutes) for finishing transfer the Ink from Ink cartridge to MidTank */ -#define CARTRIDGE_INK_TIMEOUTx2 (SECONDS_600 / SECONDS_5) /**< TimeOut (5 minutes) for second try finishing transfer the Ink from Ink cartridge to MidTank */ +#define CARTRIDGE_INK_TIMEOUT (SECONDS_420 / SECONDS_5) /**< TimeOut (7 minutes) for finishing transfer the Ink from Ink cartridge to MidTank */ +#define CARTRIDGE_INK_TIMEOUTx2 (CARTRIDGE_INK_TIMEOUT * 2) /**< TimeOut (7 minutes) for second try finishing transfer the Ink from Ink cartridge to MidTank */ #define CartridgeInkTimeOutCallBackTime (eOneSecond * SECONDS_5) #define CartridgeInkCallBackTime eOneSecond -#define MidTank_Pressure_EMPTY 0.4 //todo get from Moti the correct number +#define MidTank_Pressure_EMPTY 0.3 //todo get from Moti the correct number (Oleg -> 300cc) #define CARTRIDGE_CAPATICY 1500 //todo get from Moti the correct number #define FULL 1000 //todo get from Moti the correct number |