Skip to content

Commit 96d8c57

Browse files
committed
starting oscilloscope with sign generator=ON, f=50Hz, Ton=25%
1 parent 28612db commit 96d8c57

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

arduino/oscilloscope_arduino/oscilloscope_arduino.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const unsigned char PS_128 = (1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0);
3939
//======================================
4040

4141
boolean pwmOn=true;
42-
unsigned long pwmP=100000; //Periodo 100000u=100m=0.1s => 10Hz
42+
unsigned long pwmP=20000; //Periodo 20000us=20ms=0.02s => 50Hz
4343
byte pwmPon=25; // % do pwmP em HIGH
4444

4545
/* -- 07/May/2017 --

processing/oscilloscope_4ch/oscilloscope_4ch.pde

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ void setup() {
165165
//Gerador de Sinais - agora só gera onda quadrada, depois vai gerar triangulo, denteDeSerra, e senidal
166166
pnlSinal=new Painel("", pnlRC.x+pnlRC.w+10, pnlRC.y, 100, 85);
167167
sinal=new CheckBox("Ger.Sinal", pnlSinal.x, pnlSinal.y, 15);
168-
fSinal=new Dial(escLog, altSolta, !nInt, fmt, "f", "Hz", 10f, 125e-3f, 10e3f, pnlSinal.x+5, sinal.y+sinal.h+2, pnlSinal.w-10, 20);
169-
tSinal=new Dial(escLog, altSolta, !nInt, fmt, "T", "s", 100e-3f, 100e-6f, 8f, fSinal.x, fSinal.y+fSinal.h+2, fSinal.w, fSinal.h);
170-
tonSinal=new Dial(escLinear, altSolta, nInt, !fmt, "Ton", "%", 50f, 0f, 100f, tSinal.x, tSinal.y+tSinal.h+2, tSinal.w, tSinal.h);
168+
fSinal=new Dial(escLog, altSolta, !nInt, fmt, "f", "Hz", 50f, 125e-3f, 10e3f, pnlSinal.x+5, sinal.y+sinal.h+2, pnlSinal.w-10, 20);
169+
tSinal=new Dial(escLog, altSolta, !nInt, fmt, "T", "s", 20e-3f, 100e-6f, 8f, fSinal.x, fSinal.y+fSinal.h+2, fSinal.w, fSinal.h);
170+
tonSinal=new Dial(escLinear, altSolta, nInt, !fmt, "Ton", "%", 25f, 0f, 100f, tSinal.x, tSinal.y+tSinal.h+2, tSinal.w, tSinal.h);
171171

172172
// posicionamento da Amostragem
173173
pnlAmostra=new Painel("Amostragem", pnlSinal.x+pnlSinal.w+10, pnlSinal.y, 200, 85);
@@ -994,19 +994,25 @@ void serialEvent(Serial p) {
994994
if (cmd.equals("init")) { // init
995995
println("versionArduino=<",val,">");
996996
com.versionArduino.tex=".ino "+val.substring(0,val.length()-1);
997+
//start all channels
997998
for (int k=0;k<4;k++){
998999
canal[k].chN.clicado=true;
9991000
}
1000-
// ligar varias amostra
1001-
variasAmostras.clicado=true;
1002-
port.write("vo");
10031001
// enviar dt
10041002
enviarDt();
1005-
// enviar q
1003+
// verificar e enviar q
10061004
verificarQ();
10071005
enviarQ();
1006+
1007+
// send command to Arduino -> start Signal Gennerator 60Hz tOn25%
10081008
enviarCmd("tSinal");
10091009
enviarCmd("tonSinal");
1010+
sinal.clicado=true;
1011+
port.write("so");
1012+
1013+
// ligar varias amostra
1014+
variasAmostras.clicado=true;
1015+
port.write("vo");
10101016

10111017
//if (variasAmostras.clicado) {
10121018
// port.write("vo");

0 commit comments

Comments
 (0)