[chronojump/michrolab] Showing jump type in capture

[Xavier Padullés <xpadulles src gnome org>]

commit 55d55ee6b2cba84862687a104df4b36371b0c89a
Author: Xavier Padullés <testing chronojump org>
Date:   Wed Jul 20 12:00:11 2022 +0200

    Showing jump type in capture

 arduino/michrolab/menus.ino         | 37 +++++++++++++++++++++++++++++++++++++
 arduino/michrolab/michrolab.ino     |  4 +++-
 arduino/michrolab/personsManage.ino |  4 +++-
 3 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/arduino/michrolab/menus.ino b/arduino/michrolab/menus.ino
index 9d270ef71..b9f9a108a 100644
--- a/arduino/michrolab/menus.ino
+++ b/arduino/michrolab/menus.ino
@@ -215,3 +215,40 @@ float selectValueDialog(String description, String rangesString, String incStrin
   }
   return (value);
 }
+
+void selectJumpType()
+{
+  tft.fillScreen(BLACK);
+  tft.setCursor(40, 20);
+  tft.setTextSize(3);
+  tft.print("Jump type");
+  
+  drawLeftButton("Next", WHITE, BLUE);
+  drawRightButton("Accept", WHITE, RED);
+
+  tft.setTextSize(2);
+  tft.setCursor(50, 100);
+  tft.print(jumpTypes[currentJumpType].name);
+
+  
+  blueButton.update();
+  redButton.update();
+  while(!redButton.fell())
+  {
+    if(blueButton.fell())
+    {      
+      //Deleting last jumpType text
+      tft.setCursor(50, 100);
+      tft.setTextColor(BLACK);
+      tft.print(jumpTypes[currentJumpType].name);
+
+      //Printing new jump type text
+      tft.setCursor(50, 100);
+      tft.setTextColor(WHITE);
+      currentJumpType = (currentJumpType + 1) % totalJumpTypes;
+      tft.print(jumpTypes[currentJumpType].name);
+    }
+    blueButton.update();
+    redButton.update();
+  }
+}
diff --git a/arduino/michrolab/michrolab.ino b/arduino/michrolab/michrolab.ino
index 0621dc574..9e5780305 100644
--- a/arduino/michrolab/michrolab.ino
+++ b/arduino/michrolab/michrolab.ino
@@ -397,9 +397,10 @@ void setup() {
   //    delay(100);
   //  }
 
-  Serial.println(getTotalJumpTypes());
+  getTotalJumpTypes();
   readJumpsFile();
   printJumpTypesList();
+  currentJumpType = 0;
   
   tft.fillScreen(BLACK);
   drawMenuBackground();
@@ -1338,6 +1339,7 @@ void showPowerResults()
 
 void startJumpsCapture()
 {
+  selectJumpType();
   float maxJump = 0;
   int totalJumps = 0;
   int bestJumper = 0;
diff --git a/arduino/michrolab/personsManage.ino b/arduino/michrolab/personsManage.ino
index 1f0e54b6f..518e376de 100644
--- a/arduino/michrolab/personsManage.ino
+++ b/arduino/michrolab/personsManage.ino
@@ -149,7 +149,9 @@ void updatePersonJump(int totalJumps)
   tft.setTextSize(1);
   tft.setTextColor(WHITE);
   tft.setCursor(141, 207);
-  tft.print("Jump: " + addLeadingZeros(totalJumps, 2) +  "   Person: " + addLeadingZeros(currentPerson, 2));
+  tft.print(jumpTypes[currentJumpType].name);
+  tft.setCursor(195,207);
+  tft.print("Person: " + addLeadingZeros(currentPerson, 2));
   tft.setCursor(141, 223);
   tft.print(persons[currentPerson].name + " " + persons[currentPerson].surname);
   tft.setTextSize(2);