Add support of WHS fan controller with slave address 0x5E .

Add option to read 2 more dancers for 4 winders demo

2 files changed, 6 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 89399cbe1..853f6913a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -833,9 +833,9 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
 
         if (WHS_Type == WHS_TYPE_NEW)
         {
-            Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-1) , request->delay & 0x000000FF);
+            Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-2) , request->delay & 0x000000FF);
             Task_sleep(2000);
-            fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-1);
+            fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2);
         }
         response.progress = fan_tacho;
         response.has_progress = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
index 213902038..3d2db071e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
@@ -52,7 +52,11 @@ void Stub_DancerPositionRequest(MessageContainer* requestContainer)
     response.dancer_id = request->dancer_id;
     response.has_dancer_id = true;
 
+    #ifdef FOUR_WINDERS
+    Dancers_4_Winders Dancer_Id = (Dancers_4_Winders)request->dancer_id;//to remove warning
+    #else
     HardwareDancerType Dancer_Id = (HardwareDancerType)request->dancer_id;//to remove warning
+    #endif
 
     if(Dancer_Id < NUM_OF_ROTENC)
     {