[chronojump/michrolab] Changed deprecaded button.fallingEdge() and button.risingEdge()
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Changed deprecaded button.fallingEdge() and button.risingEdge()
- Date: Thu, 26 May 2022 10:40:39 +0000 (UTC)
commit 5d16d4568f6003936dd8c4ba35ddbfc8c7a74718
Author: xpadulles <x padulles gmail com>
Date: Thu May 26 10:51:10 2022 +0200
Changed deprecaded button.fallingEdge() and button.risingEdge()
arduino/michrolab/menus.ino | 4 ++--
arduino/michrolab/michrolab.ino | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/arduino/michrolab/menus.ino b/arduino/michrolab/menus.ino
index b3092473f..27cdda75a 100644
--- a/arduino/michrolab/menus.ino
+++ b/arduino/michrolab/menus.ino
@@ -4,7 +4,7 @@ void showMenu()
{
//The blue button navigates through the Menu options
blueButton.update();
- if (blueButton.fallingEdge()) {
+ if (blueButton.fell()) {
currentMenuIndex++;
currentMenuIndex = currentMenuIndex % menuItemsNum;
showMenuEntry(currentMenuIndex);
@@ -12,7 +12,7 @@ void showMenu()
//The red button activates the menu option
redButton.update();
- if (redButton.fallingEdge())
+ if (redButton.fell())
{
PcControlled = false;
currentMenu[currentMenuIndex].function();
diff --git a/arduino/michrolab/michrolab.ino b/arduino/michrolab/michrolab.ino
index ba02112d2..ff58b07ab 100644
--- a/arduino/michrolab/michrolab.ino
+++ b/arduino/michrolab/michrolab.ino
@@ -711,7 +711,7 @@ void calibrateTFT(void) {
//Selecting the weight
if (submenu == 0) {
//TODO: Allow coninuous increasing by keeping pressed the button
- if (blueButton.fallingEdge()) {
+ if (blueButton.fell()) {
tft.setTextColor(BLACK);
tft.setCursor(216, 150);
tft.print(weight);
@@ -735,7 +735,7 @@ void calibrateTFT(void) {
}
//Change to Calibrate execution
- if (redButton.fallingEdge()) {
+ if (redButton.fell()) {
//Deleting explanation
tft.setTextColor(BLACK);
@@ -758,7 +758,7 @@ void calibrateTFT(void) {
}
//Waiting the red button push to start calibration process
if (submenu == 1) {
- if (redButton.fallingEdge()) {
+ if (redButton.fell()) {
tft.setTextColor(BLACK);
tft.setCursor(100, 100);
@@ -797,7 +797,7 @@ void calibrateTFT(void) {
tft.fillRect(248, 218, 60, 16, BLACK);
}
- if (blueButton.fallingEdge()) {
+ if (blueButton.fell()) {
exitFlag = true;
}
}
@@ -839,7 +839,7 @@ void showSystemInfo(void) {
tft.setCursor(100, 100);
tft.print("System Info");
redButton.update();
- while (!redButton.fallingEdge()) {
+ while (!redButton.fell()) {
redButton.update();
}
tft.setTextColor(BLACK);
@@ -922,7 +922,7 @@ void showLoadCellResults() {
//Red button exits results
redButton.update();
- while (!redButton.fallingEdge()) {
+ while (!redButton.fell()) {
redButton.update();
}
tft.fillRect(0, 20, 320, 240, BLACK);
@@ -1197,7 +1197,7 @@ void capture()
//Check the buttons state
redButton.update();
blueButton.update();
- if (redButton.fallingEdge())
+ if (redButton.fell())
{
n = plotPeriod;
if (sensor == incEncoder)
@@ -1236,7 +1236,7 @@ void capture()
}
//xGraph = xMax;
}
- if (blueButton.fallingEdge() && !PcControlled)
+ if (blueButton.fell() && !PcControlled)
{
updatePersonSet();
}
@@ -1406,7 +1406,7 @@ void showEncoderResults()
printTftFormat(numRepetitions, 100, 80, textSize, 0);
redButton.update();
- while (!redButton.fallingEdge()) {
+ while (!redButton.fell()) {
redButton.update();
}
tft.fillRect(0, 20, 320, 240, BLACK);
@@ -1492,7 +1492,7 @@ void showPowerResults()
printTftFormat(measuredMax, 100, 40, textSize, 1);
redButton.update();
- while (!redButton.fallingEdge()) {
+ while (!redButton.fell()) {
redButton.update();
}
tft.fillRect(0, 20, 320, 240, BLACK);
@@ -1533,7 +1533,7 @@ void setForceGoal()
//Selecting the force goal
//TODO: Allow coninuous increasing by keeping pressed the button
- if (blueButton.fallingEdge()) {
+ if (blueButton.fell()) {
tft.setTextColor(BLACK);
printTftFormat(forceGoal, 236, 174, 2, 0);
forceGoal += increment;
@@ -1560,7 +1560,7 @@ void setForceGoal()
}
//Change to Calibrate execution
- if (redButton.fallingEdge()) {
+ if (redButton.fell()) {
//Deleting explanation
tft.fillRect(0, 60, 320, 240, BLACK);
@@ -1768,7 +1768,7 @@ void calibrateInertial()
position = encoder.read();
tft.print(position);
redButton.update();
- while(!redButton.fallingEdge())
+ while(!redButton.fell())
{
position = encoder.read();
if (position != lastEncoderPosition){
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]