Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TFG-JaimeMarques
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jaimarq
TFG-JaimeMarques
Merge requests
!1
Eliminado velostatWiFi/velostatWiFi.ino, wifi/wifi.ino, README.md
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Eliminado velostatWiFi/velostatWiFi.ino, wifi/wifi.ino, README.md
jaimarq-master-patch-59254
into
master
Overview
0
Commits
1
Pipelines
0
Changes
3
Merged
Eliminado velostatWiFi/velostatWiFi.ino, wifi/wifi.ino, README.md
jaimarq
requested to merge
jaimarq-master-patch-59254
into
master
Jul 2, 2022
Overview
0
Commits
1
Pipelines
0
Changes
3
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
f9621666
1 commit,
Jul 2, 2022
3 files
+
0
−
369
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
velostatWiFi/velostatWiFi.ino deleted
100644 → 0
+
0
−
192
View file @ fe4a4dc8
// pines analogicos
/*
* espD32 LOLIN
* ADC1_0 GPIO VN 5 NO
* ADC1_3 GPIO VP 4 NO
* ADC1_4 GPIO 32 8 y
* ADC1_5 GPIO 33 9 y
* ADC1_6 GPIO 34 6 y
* ADC1_7 GPIO 35 7 NO
* ADC2_0 GPIO 04 26 y
* ADC2_1 GPIO 00 25 y (poco rango 3400-4095)
* ADC2_2 GPIO 02 24 y
* ADC2_3 GPIO 15 23 y
* ADC2_4 GPIO 13 16 y
* ADC2_5 GPIO 12 14 y
* ADC2_6 GPIO 14 13 y
* ADC2_7 GPIO 27 12 y
* ADC2_8 GPIO 25 10 y
* ADC2_9 GPIO 26 11 y
*
* 3V -> velostat comun -> Salida1 3V --^v^v Velostat -+---+---+
* -> Analog | | |
* -> R10K -> GND Analog1--+ +---|---Analog2
* Gnd-------10K ^v^v----+ | |
Gnd-------10K ^v^v--------+ |
Gnd-------10K ^v^v------------+---Analog3
*
*/
/*
* This sketch sends data via HTTP GET requests to data.sparkfun.com service.
*
* You need to get streamId and privateKey at data.sparkfun.com and paste them
* below. Or just customize this script to talk to other HTTP servers.
*
*/
#include
<WiFi.h>
#include
<HTTPClient.h>
const
char
*
ssid
=
"MOVISTAR_6160"
;
const
char
*
password
=
"yLvf9XTbTtpUpNPp7mjB"
;
const
char
*
host
=
"arduiacob.i234.me"
;
const
char
*
hosturl
=
"http://arduiacob.i234.me/velostat/datos.php"
;
const
char
*
privateKey
=
"...................."
;
// Usamos GPIO para determinar el numero del pin
// LOLIN D32 WEMOS
//int pinanalog[] = {32,33,34,4,2,15,13,12,14,27,25,26};
// WEMOS LOLIN32
int
pinanalog
[]
=
{
36
,
39
,
32
,
33
,
34
,
35
};
//14,12,13,25,26,27};
//int pinanalog[] = {32,33,34,4,2,15,27,25,26};
//int pinanalog[] = {13,12,14,27,25,26,32};
// int pinanalog[] = {35,0};
// milisegundos entre registros
int
inter_reg
=
100
;
const
int
n
=
6
;
// numero de sensores a activar
// limite de datos = n * limit
const
int
limit
=
600
;
// Array para guardar 1000 registros de cada sensor
unsigned
int
value1
[
limit
][
n
+
1
]
;
// Array para guardar 1000 registros de cada sensor
unsigned
int
value2
[
limit
][
n
+
1
]
;
// para saber si los registros es value1 o value2
byte
value
=
1
;
// Posicion de cada registro
int
pos
=
0
;
long
t
=
0
;
int
bufferpos
=
0
;
// marca de tiempo
long
ahora
=
0
;
long
antes
=
0
;
void
setup
()
{
Serial
.
begin
(
115200
);
// WiFi
delay
(
10
);
// We start by connecting to a WiFi network
Serial
.
println
();
Serial
.
println
();
Serial
.
print
(
"Connecting to "
);
Serial
.
println
(
ssid
);
WiFi
.
begin
(
ssid
,
password
);
while
(
WiFi
.
status
()
!=
WL_CONNECTED
)
{
delay
(
500
);
Serial
.
print
(
"."
);
}
Serial
.
println
(
""
);
Serial
.
println
(
"WiFi connected"
);
Serial
.
println
(
"IP address: "
);
Serial
.
println
(
WiFi
.
localIP
());
// Iniciando entradas analógicas
for
(
int
i
=
0
;
i
<
n
;
i
++
){
pinMode
(
i
,
INPUT
);
Serial
.
print
(
pinanalog
[
i
]);
}
// Serial.println('Iniciando lectura');
// Serial.println('...');
// delay(1000);
}
void
loop
()
{
//Serial.println();
// for (int i=0; i<n; i++){
// value1[pos] = analogRead(pinanalog[i]);
// pos ++ ;
//Serial.print(analogRead(pinanalog[i]));
// delay(50);
//Serial.print(',');
// }
// Serial.println();
generaDatos
();
}
void
generaDatos
(){
/*
* DATOS:
* pos=0 {[1],[1234,1244,2355,244,523,2343,2312,313,355]}
* pos=1 {[7],[1234,1244,2355,244,523,2343,2312,313,355]}
* pos=2 {[14],[1234,1244,2355,244,523,2343,2312,313,355]}
*/
ahora
=
millis
();
if
(
ahora
-
antes
>
inter_reg
){
if
(
pos
<
(
limit
))
{
t
=
millis
();
value1
[
pos
][
0
]
=
millis
();
//Serial.print(value1[pos][0]);
//Serial.print(",");
for
(
int
i
=
0
;
i
<
n
;
i
++
){
value1
[
pos
][
i
+
1
]
=
analogRead
(
pinanalog
[
i
])
;
Serial
.
print
(
value1
[
pos
][
i
+
1
]);
Serial
.
print
(
","
);
}
Serial
.
println
();
pos
++
;
antes
=
t
;
}
else
{
pos
=
0
;
// value2 = value1;
if
(
bufferpos
==
limit
-
1
)
conexServer
();
else
{
while
(
bufferpos
<
limit
)
cargabuffer
();
conexServer
();
}
}
}
cargabuffer
();
}
void
cargabuffer
(){
int
pos2
;
if
(
pos
!=
0
)
pos2
=
pos
;
else
pos2
=
limit
;
for
(
int
i
=
bufferpos
;
i
<
pos2
;
i
++
){
for
(
int
z
=
0
;
z
<
n
+
1
;
z
++
){
value2
[
i
][
z
]
=
value1
[
i
][
z
];
}
}
bufferpos
=
pos2
-
1
;
}
Loading