diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-17 16:16:07 +0300 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-17 16:16:07 +0300 |
| commit | ea706238b6023018388e08dcdb779ea8e72f9970 (patch) | |
| tree | c24b12230ad4f36cf4d0eb6e1c4b4db2dd82d42a /Software | |
| parent | b70bf27634e6ee2d34ff151fa0ea165fe4405cc5 (diff) | |
| download | Tango-ea706238b6023018388e08dcdb779ea8e72f9970.tar.gz Tango-ea706238b6023018388e08dcdb779ea8e72f9970.zip | |
power off button after 5sec at sample rate 100ms
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Embedded_SW/Embedded/.cproject | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/buttons.c | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index b995119b0..ab125b40a 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -170,7 +170,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="EmbParam.cfg|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -269,7 +269,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="Embedded.cfg|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -441,7 +441,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="Drivers/Uart_Comm/Uart.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="Embedded.cfg|Drivers/Uart_Comm/Uart.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> 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 |