From 3c3f2a2e2d4197dca866c7d1bd6ed2eefa787423 Mon Sep 17 00:00:00 2001
From: ChrGri <christophergrimm88@web.de>
Date: Mon, 25 Dec 2023 06:38:10 +0100
Subject: [PATCH] Bugfix: No joystick output

---
 Arduino/Esp32/Main/Main.ino                  |  86 +++++++------------
 SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo | Bin 135680 -> 152576 bytes
 2 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/Arduino/Esp32/Main/Main.ino b/Arduino/Esp32/Main/Main.ino
index b03c9018..92b859bf 100644
--- a/Arduino/Esp32/Main/Main.ino
+++ b/Arduino/Esp32/Main/Main.ino
@@ -17,11 +17,7 @@ bool isv57LifeSignal_b = false;
   int32_t servo_offset_compensation_steps_i32 = 0; 
 #endif
 
-#ifdef Using_analog_output
-  int32_t Using_analog_output_ = 1;
-#else
-  int32_t Using_analog_output_ = 0;
-#endif
+
 
 
 
@@ -213,15 +209,9 @@ void setup()
   Serial.println(" ");
 
   // init controller
-  if(Using_analog_output_ !=1)
-  {
-    SetupController();
-    delay(2000);
-  }
-  else
-  {
-    delay(10000);
-  }
+  SetupController();
+  delay(2000);
+
 
 
 // check whether iSV57 communication can be established
@@ -678,19 +668,6 @@ void pedalUpdateTask( void * pvParameters )
         joystickNormalizedToInt32 = NormalizeControllerOutputValue(loadcellReading, dap_calculationVariables_st.Force_Min, dap_calculationVariables_st.Force_Max, dap_config_st.payLoadPedalConfig_.maxGameOutput);
         //joystickNormalizedToInt32 = NormalizeControllerOutputValue(filteredReading, dap_calculationVariables_st.Force_Min, dap_calculationVariables_st.Force_Max, dap_config_st.payLoadPedalConfig_.maxGameOutput);
         xSemaphoreGive(semaphore_updateJoystick);
-        if(Using_analog_output_ =1)
-        {
-          int dac_value=(int)(joystickNormalizedToInt32*255/10000);
-          dacWrite(D_O,dac_value);
-        }
-        if(dap_config_st.payLoadPedalConfig_.Simulate_ABS_trigger==1)
-        {
-          int32_t ABS_trigger_value=dap_config_st.payLoadPedalConfig_.Simulate_ABS_value*100;
-          if(joystickNormalizedToInt32 > ABS_trigger_value)
-          {
-            absOscillation.trigger();
-          }
-        }       
       }
     }
     else
@@ -699,6 +676,25 @@ void pedalUpdateTask( void * pvParameters )
       //Serial.println("semaphore_updateJoystick == 0");
     }
 
+    // provide joystick output on PIN
+    #ifdef Using_analog_output
+      int dac_value=(int)(joystickNormalizedToInt32*255/10000);
+      dacWrite(D_O,dac_value);
+    #endif
+
+
+    // simulate ABS trigger 
+    if(dap_config_st.payLoadPedalConfig_.Simulate_ABS_trigger==1)
+    {
+      int32_t ABS_trigger_value=dap_config_st.payLoadPedalConfig_.Simulate_ABS_value*100;
+      if(joystickNormalizedToInt32 > ABS_trigger_value)
+      {
+        absOscillation.trigger();
+      }
+    }
+
+    
+
     #ifdef PRINT_USED_STACK_SIZE
       unsigned int temp2 = uxTaskGetStackHighWaterMark(nullptr);
       Serial.print("PU task stack size="); Serial.println(temp2);
@@ -888,41 +884,25 @@ void serialCommunicationTask( void * pvParameters )
       }
     }
 
+
+
     // transmit controller output
-    if(Using_analog_output_ =1)
+    if (IsControllerReady()) 
     {
       if(semaphore_updateJoystick!=NULL)
       {
-      if(xSemaphoreTake(semaphore_updateJoystick, (TickType_t)1)==pdTRUE)
-      {
-        joystickNormalizedToInt32_local = joystickNormalizedToInt32;
-        xSemaphoreGive(semaphore_updateJoystick);
-        }
-        //else
-        //{
-        //Serial.println("semaphore_updateJoystick == 0");
-        //}
-        }
-    }
-    else
-    {
-      if (IsControllerReady()) {
-        if(semaphore_updateJoystick!=NULL)
+        if(xSemaphoreTake(semaphore_updateJoystick, (TickType_t)1)==pdTRUE)
         {
-          if(xSemaphoreTake(semaphore_updateJoystick, (TickType_t)1)==pdTRUE)
-          {
-            joystickNormalizedToInt32_local = joystickNormalizedToInt32;
-            xSemaphoreGive(semaphore_updateJoystick);
-          }
-          //else
-          //{
-            //Serial.println("semaphore_updateJoystick == 0");
-          //}
+          joystickNormalizedToInt32_local = joystickNormalizedToInt32;
+          xSemaphoreGive(semaphore_updateJoystick);
         }
-        SetControllerOutputValue(joystickNormalizedToInt32_local);
       }
+      SetControllerOutputValue(joystickNormalizedToInt32_local);
     }
 
+
+
+
   }
 }
 
diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo b/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo
index 53f123177392a05c7e42584644511401e1634e20..ba4dcfae1af9f0e8cf0fae42b2b54d14315ef755 100644
GIT binary patch
delta 1569
zcmZ`(eP~-%6wi50+Sl&AG-;Y_wslR~wCmQids(}#O>1~tOZR50>4r){7#+G%spw=8
zSCOt1VFLr&chxti_($AIWel|$&G4gSW?0yulR6Yd*!*D9O^Vtlf^3WD<ios5y}Tdi
z-gC}9=XcLN_l=+C$ES;5lj=;lVKbR(abAG9mrA8b4G1ryn)x5B{^)Q7RIVRNnTM;k
z$UmGJQrL6cKGtpb$8=5r;2D@Jk8MDI0kIx|VNw>9rHJC}`o63zLRpC@%dRQsCY-wv
zRfx?9JHm|+5#>mx2IXD!yB{URzKe2QR_Dy<N>UVvMg@_cJba!VwOq@RmiD}7Bwgr*
zG+pv0$|Q5N%W++TFlY5dr4W&$OvhM@GR1JCjVRNcD3f#`eWFg3tq7Xqu%?K2j<PLJ
z`9xIU@KasgB9J3p1xaRid0BYNmjW%QMtNmp<bS+fArXkL-{`Jy8CW~U#-x}odaJ=Z
zrk4qz$~}Syl^q5H3(Fzu0H(_WLJJzUt}^b7%*YDx|5ZlYIkn-E5J2Btedt^<y#cdW
zd)TD{iG{5Ltj8`f-I`8dnMUV1Hd=ZdH_y~3K?Le7X;r$qDrS?;r;kNM|1FI!g;=t{
z&%*wQ+T1OgD$tngp-e%Wu|(wFY}gjlo3X3sV$hZX&3_#fZQ*OMYjfX1M_j!D`=IC#
z>~yo!r0x9`oOw>hG7EII7&ARI=z}ILxB`xt>`Q>!+he9zp^YzrkA-_fqG>xW>k)b8
zy^ruajEWD(&Ftvz6RHjSf_gRgd@{$d;W4(Mw!yeXw_W3#3<`KF_NV`0po+x8EfG$Y
zl9?+sR4MQ~Ofs=8#HIpP7V2y)Y;EuGwY9Kgoia;w%4!hPw_{A7A+DAf1tb^j%apP)
zZ)#xfSIq2AaGvsrXVAbSXk2C&yRLYOzFU!&d3hr8chyt<W7~fGX7us1)h|Br?gzr5
z$n&!`%O-pmj;Wsj)PPI7+6Nn0)2>F*-_qu5-TqSVfv1lge1pi6X<aO_ONPm3-OSzZ
zEq7oFswIt$**P2RSD-HQN0UMA8uMJ~UcNm&ukdp}U%c&D8mT-t^61jZiLz6-h7&8V
z#*crWPS0k#Zg^f0PS<_<&|gCf`zv-PXU=xa??1Ii8P?u$j=j!%Dx4!3&o3SbOdeQG
zfc{>q2-N2YK={p@(8@mBQOq4V7?*EC0-}m}%EoboXbrcPgEwuQ7@Qr1_+E&{FT4-R
z@YKg()|NlP7Jd6FRK=SX;49Ed7Gb?6E<#D%vk2EW&)$R2t?aSdXV_5flW9mCui5Xw
UR_(W6z@i09xtHS?tegV>09ZvnNdN!<

delta 1577
zcmb`HZETZO6vulmZMV+0d+A`zb*z;+z!mJ0PKt)oIFy=gv>-?aLzy3piJE9qP{Y&;
zz9fon>yb?OLi#{v)dXj&4q?K`5={KUK9CTnBqSyVJ`flVb#q(&pZ1wHzI@V~{CfW9
z+<VV+?|Dw2c*+t#R^02oQyKJ8W-wSG7l65JHY-ulZcv&@1|OroXWJ60jaIQ+)tSbQ
z95}dvpHrJ{<iZLcz@{vhm(^z`m6gcOWUQ%`n2b(+KJR6-JK?Y7WUz`J;jUK4))nxb
z`kGo;2j%n0`h^9$19P*82{PoQGPWRIt?w8AF6c_+?_a)3k8UrRH9=c+-v+x3@C&93
z`MX&zFIjYP!#(5Fz`NDPf4ZN!o}Q`0o;!d8$P*XCmV+AImzbPVPFRK5ZJ<J*lUND#
zBCte{$?c6mZhr%qK@qqKW;t2xsQ(NK8?%kN743n(yTIq+kk7gnfdE(scqZg|pcSGG
zw1bTx3?g6?*bE*9TY+TUrrRj&4qZ$9aa6O0p2qJo9(>42-B3%*Uc!o(!7CsRv=U>&
zx!&l9?2lh1567Gl>uPvXDoG;^!jsOhjqp|tO$AX?3eFjRvG&b`x5Z|VcQjwG+@_c}
zY|GtM?)+ye?}glhOotFH=Be_%YRbTSD%x!%Yozk?YcrD-R{9@KXK&$A)x<G-oDT6V
zd)O+iBn>?OAX?75OW)RfN(-s~beC`b?Gh!G7U`iP)No-Y|KEH~izsc2O1nmhM_p^R
zPL=rMpkseKBF9P(^iwOX<kRhrOwcnz+M`PQNNL9v&P``B)Q}}@u}b(SsF!UGVIJ_?
zIlQLP)YRnjcsaf%sP+u=*}%}jpfbCC3vRf_yVBFCv^j7*(6z7eVux0mYM5~!+4WV?
zL}bi>W^r)({>$$3-}WR&jH$Y*Ykl^?;q7mAe*MG#r+Pk(MV_~;e_|j#lV5qR<zDRz
zrJYnvfv9P9v)|LqVgI)N^Q~mfj0A#I{VM9c54^6|U26XZ^gDP`P4&A_J)jr#fdpXi
zzMLahy2J1^cy-N3p^kw8AXz?u{aDxH%lPCk{-AucYClJGNS`?Y`z1IDPJwac-fQ~~
z>U(er{D{a>%M~cec$JgYRS#Z=cRQE>E-(uw!7cDJ_yzn5%y`k$u)l#BFb94Dxvw;3
z=1wW}nvtj1x!4t~udKjwNm~i)f|ax!4TelB5Riu1LE3304Kq^MGkmk7dw+Lys5?sc
OZKC&vPJBqACw~Xaz&$_!