aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-04-28 19:38:01 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-04-28 19:38:01 +0300
commit61f41a507e70fe0dfd30c46fd9ad04ce490df2c4 (patch)
treeaf7a6c5b613280a7e42080e5cc7f3f1e8af8ec0d /Software/Embedded_SW/Embedded/Modules
parent3bed1b881037c06d160573583be4d85dc186d3a7 (diff)
parent363603ac89278995f8c7730c6fc92a8e19ed1f92 (diff)
downloadTango-61f41a507e70fe0dfd30c46fd9ad04ce490df2c4.tar.gz
Tango-61f41a507e70fe0dfd30c46fd9ad04ce490df2c4.zip
merged
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/control.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c11
2 files changed, 10 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index b316fd73f..f1e19d851 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -158,7 +158,7 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
{
static bool flag = false;
static uint8_t counter;
- const uint8_t Blink_Freq = 15;//odd number
+ const uint8_t Blink_Freq = 3;//odd number
if (flag==true)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
index da16df729..6a1821f4b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
@@ -26,6 +26,7 @@
#include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
#include "drivers/Valves/Valve.h"
#include "drivers/Heater/Heater.h"
+#include "modules/waste/waste.h"
#include "modules/ids/ids_ex.h"
@@ -243,18 +244,24 @@ uint32_t SetDigitalOutRequestRequestFunc(MessageContainer* requestContainer)
/* case INTERFACE_IOS__GPO_LED4:
DataUpdated = request->value;
break;*/
- case INTERFACE_IOS__GPO_BLOWER_PWM:
+/* case INTERFACE_IOS__GPO_BLOWER_PWM:
if (request->value == true)
Control_Dryer_Fan(START,75);
else
Control_Dryer_Fan(STOP, 0);
- break;
+ break;*/
case INTERFACE_IOS__VALVE_WASTE_TANK:
if (request->value == true)
Valve_Set(VALVE_MIXCHIP_WASTECH,1);
else
Valve_Set(VALVE_MIXCHIP_WASTECH,0);
break;
+ case INTERFACE_IOS__GPO_BLOWER_PWM:
+ if (request->value == true)
+ Control_Dryer_Fan(START,75);//use START or STOP, 0 - 100%();
+ else
+ Control_Dryer_Fan(STOP,0);//use START or STOP, 0 - 100%();
+ break;
case INTERFACE_IOS__GPO_WASTECH_PUMP2://valve
Valve_Set(VALVE_WASTE_TANK, request->value);
break;