Fixed button operation when shift exists but not pressed

Yury Vostrenkov · Yury Vostrenkov · commit bed21677f1ae · 2020-06-23T19:31:47.000+03:00
diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
diff --git a/MDK-ARM/FreeJoy.uvoptx b/MDK-ARM/FreeJoy.uvoptx
@@ -153,7 +153,24 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>704</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134236764</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\application\Src\buttons.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\FreeJoy\../application/Src/buttons.c\704</Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -220,6 +237,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>raw_buttons</ItemText>
         </Ww>
+        <Ww>
+          <count>13</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>shifts_state</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
@@ -279,16 +301,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\GPIOA</Name>
-          <WinId>35905</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\USB</Name>
-          <WinId>35904</WinId>
-        </Entry>
-      </SystemViewers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>1</EnableFlashSeq>
@@ -431,7 +443,24 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>704</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\application\Src\buttons.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
diff --git a/MDK-ARM/FreeJoy.uvprojx b/MDK-ARM/FreeJoy.uvprojx
@@ -312,7 +312,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>1</Optim>
+            <Optim>4</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
diff --git a/application/Inc/main.h b/application/Inc/main.h
@@ -18,7 +18,7 @@
 
 static const dev_config_t init_config =
 {
-	.firmware_version = 0x1605,		// do not change
+	.firmware_version = 0x1606,		// do not change
 	
 	/* 
 		Name of device in devices dispatcher
diff --git a/application/Src/buttons.c b/application/Src/buttons.c
@@ -760,7 +760,7 @@ void ButtonsReadLogical (dev_config_t * p_dev_config)
 					(p_dev_config->buttons[j].shift_modificator) == 0)
 				{
 					logical_buttons_state[j].prev_physical_state = logical_buttons_state[j].curr_physical_state;
-					logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[i].physical_num].current_state;
+					logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[j].physical_num].current_state;
 					
 					LogicalButtonProcessState(&logical_buttons_state[j], pov_pos, p_dev_config, j);
 				}
diff --git a/common_defines.h b/common_defines.h
@@ -11,7 +11,7 @@
 
 //#define DEBUG
 
-#define FIRMWARE_VERSION					0x1605			// v1.6.0b5
+#define FIRMWARE_VERSION					0x1606			// v1.6.0b6
 #define USED_PINS_NUM							30					// constant for BluePill and BlackPill boards
 #define MAX_AXIS_NUM							8						// max 8
 #define MAX_BUTTONS_NUM						128					// power of 2, max 128

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`static const dev_config_t init_config =`
`20`	`20`	`{`
`21`		`- .firmware_version = 0x1605, // do not change`
	`21`	`+ .firmware_version = 0x1606, // do not change`
`22`	`22`
`23`	`23`	`/*`
`24`	`24`	`Name of device in devices dispatcher`
Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ void ButtonsReadLogical (dev_config_t * p_dev_config)`
`760`	`760`	`(p_dev_config->buttons[j].shift_modificator) == 0)`
`761`	`761`	`{`
`762`	`762`	`logical_buttons_state[j].prev_physical_state = logical_buttons_state[j].curr_physical_state;`
`763`		`- logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[i].physical_num].current_state;`
	`763`	`+ logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[j].physical_num].current_state;`
`764`	`764`
`765`	`765`	`LogicalButtonProcessState(&logical_buttons_state[j], pov_pos, p_dev_config, j);`
`766`	`766`	`}`