Fixed lower and upper calibration limits

FreeJoy-Team · Jan 10, 2020 · 1cd861a · 1cd861a
2 parents 283bc44 + c23437d
commit 1cd861a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
diff --git a/MDK-ARM/FreeJoy.uvoptx b/MDK-ARM/FreeJoy.uvoptx
@@ -205,6 +205,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>USBD_SERIALNUMBER_STRING_FS</ItemText>
         </Ww>
+        <Ww>
+          <count>11</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>tmp16,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>

diff --git a/MDK-ARM/FreeJoy_v1_01b2.zip b/MDK-ARM/FreeJoy_v1_01b2.zip
diff --git a/Src/analog.c b/Src/analog.c
@@ -43,8 +43,8 @@ static uint32_t map2(	uint32_t x,
 	tmp8 = x;
 
 
-	if (tmp8 < in_min)	return in_min;
-	if (tmp8 > in_max)	return in_max;
+	if (tmp8 < in_min)	return out_min;
+	if (tmp8 > in_max)	return out_max;
 
 	ret = (tmp8 - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 
@@ -65,8 +65,8 @@ static uint32_t map3(	uint32_t x,
 	tmp8 = x;
 
 
-	if (tmp8 < in_min)	return in_min;
-	if (tmp8 > in_max)	return in_max;
+	if (tmp8 < in_min)	return out_min;
+	if (tmp8 > in_max)	return out_max;
 
 	if (tmp8 < in_center)
 	{