[chronojump/michrolab] Fixed warnings and changed libraries includes
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Fixed warnings and changed libraries includes
- Date: Wed, 25 May 2022 09:05:15 +0000 (UTC)
commit e2a2d27c30d857a2f99bd0fe7a14678ee79df4fc
Author: Xavier Padullés <testing chronojump org>
Date: Wed May 25 11:03:27 2022 +0200
Fixed warnings and changed libraries includes
.../ForceSensor-0.4/ForceSensor-0.4.ino | 12 +
arduino/michrolab/libraries/SD/README.adoc | 26 -
.../libraries/SD/examples/CardInfo/CardInfo.ino | 116 --
.../SD/examples/Datalogger/Datalogger.ino | 84 --
.../libraries/SD/examples/DumpFile/DumpFile.ino | 65 -
.../libraries/SD/examples/Files/Files.ino | 75 -
.../examples/NonBlockingWrite/NonBlockingWrite.ino | 91 --
.../libraries/SD/examples/ReadWrite/ReadWrite.ino | 79 -
.../libraries/SD/examples/listfiles/listfiles.ino | 80 -
.../SD/extras/codespell-ignore-words-list.txt | 0
arduino/michrolab/libraries/SD/keywords.txt | 31 -
arduino/michrolab/libraries/SD/library.properties | 9 -
arduino/michrolab/libraries/SD/src/File.cpp | 168 ---
arduino/michrolab/libraries/SD/src/README.txt | 13 -
arduino/michrolab/libraries/SD/src/SD.cpp | 637 --------
arduino/michrolab/libraries/SD/src/SD.h | 138 --
.../libraries/SD/src/utility/FatStructs.h | 418 ------
.../michrolab/libraries/SD/src/utility/Sd2Card.cpp | 777 ----------
.../michrolab/libraries/SD/src/utility/Sd2Card.h | 273 ----
.../michrolab/libraries/SD/src/utility/Sd2PinMap.h | 525 -------
arduino/michrolab/libraries/SD/src/utility/SdFat.h | 641 --------
.../michrolab/libraries/SD/src/utility/SdFatUtil.h | 77 -
.../libraries/SD/src/utility/SdFatmainpage.h | 202 ---
.../michrolab/libraries/SD/src/utility/SdFile.cpp | 1527 --------------------
.../michrolab/libraries/SD/src/utility/SdInfo.h | 232 ---
.../libraries/SD/src/utility/SdVolume.cpp | 351 -----
arduino/michrolab/michrolab.ino | 27 +-
27 files changed, 18 insertions(+), 6656 deletions(-)
---
diff --git a/arduino/ForceSensor/ForceSensor-0.4/ForceSensor-0.4.ino
b/arduino/ForceSensor/ForceSensor-0.4/ForceSensor-0.4.ino
index 8adce0dbf..41086dc45 100644
--- a/arduino/ForceSensor/ForceSensor-0.4/ForceSensor-0.4.ino
+++ b/arduino/ForceSensor/ForceSensor-0.4/ForceSensor-0.4.ino
@@ -60,8 +60,19 @@ unsigned long currentTime = 0;
unsigned long elapsedTime = 0;
unsigned long totalTime = 0;
+
+int led = 13;
+
void setup() {
Serial.begin(115200);
+ Serial.println("Inici");
+ pinMode(led, OUTPUT);
+ while(true){
+ digitalWrite(led, HIGH);
+ delay(500);
+ digitalWrite(led, LOW);
+ delay(500);
+ }
long tare = 0;
EEPROM.get(tareAddress, tare);
@@ -82,6 +93,7 @@ void setup() {
} else {
scale.set_scale(calibration_factor);
}
+
}
void loop() {
diff --git a/arduino/michrolab/michrolab.ino b/arduino/michrolab/michrolab.ino
index dfb6ee56d..6cdca5a1e 100644
--- a/arduino/michrolab/michrolab.ino
+++ b/arduino/michrolab/michrolab.ino
@@ -1,4 +1,4 @@
-/*
+ /*
#
# This file is part of ChronoJump
#
@@ -27,11 +27,11 @@
#include "SPI.h"
#include "ILI9341_t3.h"
#include "HX711.h"
-#include <Bounce2.h>
-#include <Encoder.h>
-#include <SD.h>
-#include <elapsedMillis.h>
-#include </home/xpadulles/chronojump/arduino/michrolab/michrolab.h>
+#include "Bounce2.h"
+#include "Encoder.h"
+#include "SD.h"
+#include "elapsedMillis.h"
+#include "michrolab.h"
#define DOUT 2
#define CLK 3
@@ -1866,21 +1866,6 @@ void showMenu()
}
}
-void backMenu(void)
-{
- currentMenuIndex = 0;
- drawMenuBackground();
- currentMenuIndex = 0;
- for (int i = 0; i< 10; i++){
- currentMenu[i].title = mainMenu[i].title;
- currentMenu[i].description = mainMenu[i].description;
- currentMenu[i].function = mainMenu[i].function;
- }
- menuItemsNum = 6;
- showMenuEntry(currentMenuIndex);
- showMenu();
-}
-
void startInertialEncoderCapture()
{
inertialMode = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]