esp32/Ringo: Fixed incorrect input mapping

Author: MiLeG

ports/esp32/libraries/Ringo/Buttons.py

@@ -40,17 +40,20 @@ def __init__(self, expander: PCA95XX, ads: ADS1015):
 	def expander_scan(self):
 		state = self.expander.state_read()
 
-		for i in range(len(self.expander_btns)):
-			pin = Buttons.Pins[self.expander_btns[i]]
+		for exp_btn in self.expander_btns:
+			pin = Buttons.Pins[exp_btn]
 
-			if ((state >> pin) & 1) == 1:
-				self.released(pin)
+			released: bool = ((state >> pin) & 1) == 1
+			if pin == 14:
+				released = not released
+
+			if released:
+				self.released(exp_btn)
 			else:
-				self.pressed(pin)
+				self.pressed(exp_btn)
 
 	def ads_scan(self):
 		for btn in self.ads_btns:
-			# print("Buttons reading ADS channel", Buttons.Pins[btn])
 			self.ads.read(Buttons.Pins[btn])
 			if self.ads.read(Buttons.Pins[btn]) < 5:
 				self.pressed(btn)

ports/esp32/libraries/Ringo/Pins.py

@@ -40,8 +40,9 @@ class Buttons:
 	Num_0: int = const(9)
 	Num_Ast: int = const(10)
 	Num_Hash: int = const(11)
+
 	Home: int = const(12)
-	Power: int = const(13)
+	Power: int = const(13)  # Note: only input that behaves 0 - released, 1 - pressed, rest are pulled-up
 	Alt_L: int = const(14)
 	Alt_R: int = const(15)
 
@@ -63,8 +64,9 @@ class Buttons:
 		const(10),
 		const(9),
 		const(11),
-		const(14),
+
 		const(13),
+		const(14),
 		const(15),
 		const(12),