Skip to content

Commit d8b68a0

Browse files
Tinyu-ZhaoTinyu-Zhao
committed
Code Format
1 parent d8c2343 commit d8b68a0

File tree

155 files changed

+103378
-105554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+103378
-105554
lines changed

‎examples/Advanced/Audio/PlayMP3FromSDToDAC/PlayMP3FromSDToDAC.ino‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,43 @@ git clone https://github.com/earlephilhower/ESP8266Audio
55
git clone https://github.com/Gianbacchio/ESP8266_Spiram
66
*/
77

8-
98
#include <M5Stack.h>
109
#include <WiFi.h>
11-
#include "AudioFileSourceSD.h"
10+
1211
#include "AudioFileSourceID3.h"
12+
#include "AudioFileSourceSD.h"
1313
#include "AudioGeneratorMP3.h"
1414
#include "AudioOutputI2S.h"
1515

16-
1716
AudioGeneratorMP3 *mp3;
1817
AudioFileSourceSD *file;
1918
AudioOutputI2S *out;
2019
AudioFileSourceID3 *id3;
2120

22-
void setup()
23-
{
24-
M5.begin();
25-
M5.Power.begin();
26-
WiFi.mode(WIFI_OFF);
27-
delay(500);
28-
29-
M5.Lcd.setTextFont(2);
30-
M5.Lcd.printf("Sample MP3 playback begins...\n");
31-
Serial.printf("Sample MP3 playback begins...\n");
32-
33-
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
34-
file = new AudioFileSourceSD("/pno-cs.mp3");
35-
id3 = new AudioFileSourceID3(file);
36-
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
37-
out->SetOutputModeMono(true);
38-
mp3 = new AudioGeneratorMP3();
39-
mp3->begin(id3, out);
21+
void setup() {
22+
M5.begin();
23+
M5.Power.begin();
24+
WiFi.mode(WIFI_OFF);
25+
delay(500);
26+
27+
M5.Lcd.setTextFont(2);
28+
M5.Lcd.printf("Sample MP3 playback begins...\n");
29+
Serial.printf("Sample MP3 playback begins...\n");
30+
31+
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
32+
file = new AudioFileSourceSD("/pno-cs.mp3");
33+
id3 = new AudioFileSourceID3(file);
34+
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
35+
out->SetOutputModeMono(true);
36+
mp3 = new AudioGeneratorMP3();
37+
mp3->begin(id3, out);
4038
}
4139

42-
void loop()
43-
{
44-
if (mp3->isRunning()) {
45-
if (!mp3->loop()) mp3->stop();
46-
} else {
47-
Serial.printf("MP3 done\n");
48-
delay(1000);
49-
}
40+
void loop() {
41+
if (mp3->isRunning()) {
42+
if (!mp3->loop()) mp3->stop();
43+
} else {
44+
Serial.printf("MP3 done\n");
45+
delay(1000);
46+
}
5047
}

‎examples/Advanced/Audio/PlayMP3FromSPIFFSToDAC/PlayMP3FromSPIFFSToDAC.ino‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,53 @@
11
#pragma mark - Depend ESP8266Audio and ESP8266_Spiram libraries
2-
/*
2+
/*
33
cd ~/Arduino/libraries
44
git clone https://github.com/earlephilhower/ESP8266Audio
55
git clone https://github.com/Gianbacchio/ESP8266_Spiram
66
77
Use the "Tools->ESP32 Sketch Data Upload" menu to write the MP3 to SPIFFS
8-
Then upload the sketch normally.
8+
Then upload the sketch normally.
99
https://github.com/me-no-dev/arduino-esp32fs-plugin
1010
*/
1111

12-
1312
#include <M5Stack.h>
1413
#include <WiFi.h>
15-
#include "SPIFFS.h"
16-
#include "AudioFileSourceSPIFFS.h"
14+
1715
#include "AudioFileSourceID3.h"
16+
#include "AudioFileSourceSPIFFS.h"
1817
#include "AudioGeneratorMP3.h"
1918
#include "AudioOutputI2S.h"
20-
19+
#include "SPIFFS.h"
2120

2221
AudioGeneratorMP3 *mp3;
2322
AudioFileSourceSPIFFS *file;
2423
AudioOutputI2S *out;
2524
AudioFileSourceID3 *id3;
2625

27-
28-
void setup()
29-
{
30-
M5.begin();
31-
M5.Power.begin();
32-
WiFi.mode(WIFI_OFF);
33-
SPIFFS.begin();
34-
delay(500);
35-
36-
M5.Lcd.setTextFont(2);
37-
M5.Lcd.printf("Sample MP3 playback begins...\n");
38-
Serial.printf("Sample MP3 playback begins...\n");
39-
40-
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
41-
file = new AudioFileSourceSPIFFS("/pno-cs.mp3");
42-
id3 = new AudioFileSourceID3(file);
43-
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
44-
out->SetOutputModeMono(true);
45-
mp3 = new AudioGeneratorMP3();
46-
mp3->begin(id3, out);
26+
void setup() {
27+
M5.begin();
28+
M5.Power.begin();
29+
WiFi.mode(WIFI_OFF);
30+
SPIFFS.begin();
31+
delay(500);
32+
33+
M5.Lcd.setTextFont(2);
34+
M5.Lcd.printf("Sample MP3 playback begins...\n");
35+
Serial.printf("Sample MP3 playback begins...\n");
36+
37+
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
38+
file = new AudioFileSourceSPIFFS("/pno-cs.mp3");
39+
id3 = new AudioFileSourceID3(file);
40+
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
41+
out->SetOutputModeMono(true);
42+
mp3 = new AudioGeneratorMP3();
43+
mp3->begin(id3, out);
4744
}
4845

49-
void loop()
50-
{
51-
if (mp3->isRunning()) {
52-
if (!mp3->loop()) mp3->stop();
53-
} else {
54-
Serial.printf("MP3 done\n");
55-
delay(1000);
56-
}
46+
void loop() {
47+
if (mp3->isRunning()) {
48+
if (!mp3->loop()) mp3->stop();
49+
} else {
50+
Serial.printf("MP3 done\n");
51+
delay(1000);
52+
}
5753
}

‎examples/Advanced/Audio/PlayWAVFromSDToDAC/PlayWAVFromSDToDAC.ino‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,48 @@
11
#pragma mark - Depend ESP8266Audio and ESP8266_Spiram libraries
2-
/*
2+
/*
33
cd ~/Arduino/libraries
44
git clone https://github.com/earlephilhower/ESP8266Audio
55
git clone https://github.com/Gianbacchio/ESP8266_Spiram
66
77
Use the "Tools->ESP32 Sketch Data Upload" menu to write the MP3 to SPIFFS
8-
Then upload the sketch normally.
8+
Then upload the sketch normally.
99
https://github.com/me-no-dev/arduino-esp32fs-plugin
1010
*/
1111

1212
#include <M5Stack.h>
1313
#include <WiFi.h>
14+
1415
#include "AudioFileSourceSD.h"
1516
#include "AudioGeneratorWAV.h"
1617
#include "AudioOutputI2S.h"
1718

18-
1919
AudioGeneratorWAV *wav;
2020
AudioFileSourceSD *file;
2121
AudioOutputI2S *out;
2222

23-
void setup()
24-
{
25-
M5.begin();
26-
M5.Power.begin();
27-
WiFi.mode(WIFI_OFF);
28-
delay(500);
29-
30-
M5.Lcd.setTextFont(2);
31-
M5.Lcd.printf("Sample WAV playback begins...\n");
32-
Serial.printf("Sample WAV playback begins...\n");
33-
34-
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
35-
file = new AudioFileSourceSD("/pno-cs.wav");
36-
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
37-
out->SetOutputModeMono(true);
38-
wav = new AudioGeneratorWAV();
39-
wav->begin(file, out);
40-
}
23+
void setup() {
24+
M5.begin();
25+
M5.Power.begin();
26+
WiFi.mode(WIFI_OFF);
27+
delay(500);
4128

42-
void loop()
43-
{
44-
if (wav->isRunning()) {
45-
if (!wav->loop()) wav->stop();
46-
} else {
47-
Serial.printf("WAV done\n");
48-
delay(1000);
49-
}
29+
M5.Lcd.setTextFont(2);
30+
M5.Lcd.printf("Sample WAV playback begins...\n");
31+
Serial.printf("Sample WAV playback begins...\n");
32+
33+
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
34+
file = new AudioFileSourceSD("/pno-cs.wav");
35+
out = new AudioOutputI2S(0, 1); // Output to builtInDAC
36+
out->SetOutputModeMono(true);
37+
wav = new AudioGeneratorWAV();
38+
wav->begin(file, out);
5039
}
5140

41+
void loop() {
42+
if (wav->isRunning()) {
43+
if (!wav->loop()) wav->stop();
44+
} else {
45+
Serial.printf("WAV done\n");
46+
delay(1000);
47+
}
48+
}

‎examples/Advanced/Blynk/Post-DHT12/DHT12.cpp‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
/*
2-
DHT12.cpp - Library for DHT12 sensor.
3-
v0.0.1 Beta
4-
Created by Bobadas, July 30,2016.
5-
Released into the public domain.
2+
DHT12.cpp - Library for DHT12 sensor.
3+
v0.0.1 Beta
4+
Created by Bobadas, July 30,2016.
5+
Released into the public domain.
66
*/
7+
#include "DHT12.h"
8+
79
#include "Arduino.h"
810
#include "Wire.h"
9-
#include "DHT12.h"
1011

11-
DHT12::DHT12(byte scale,byte id)
12-
{
13-
if (id==0 || id>126) _id=0x5c;
14-
else _id=id;
15-
if (scale==0 || scale>3) _scale=CELSIUS;
16-
else _scale=scale;
12+
DHT12::DHT12(byte scale, byte id) {
13+
if (id == 0 || id > 126)
14+
_id = 0x5c;
15+
else
16+
_id = id;
17+
if (scale == 0 || scale > 3)
18+
_scale = CELSIUS;
19+
else
20+
_scale = scale;
1721
}
1822

19-
byte DHT12::read()
20-
{
21-
Wire.beginTransmission(_id);
22-
Wire.write(0);
23-
if (Wire.endTransmission()!=0) return 1;
24-
Wire.requestFrom(_id, 5);
25-
for (int i=0;i<5;i++) {
26-
datos[i]=Wire.read();
27-
};
28-
delay(50);
29-
if (Wire.available()!=0) return 2;
30-
if (datos[4]!=(datos[0]+datos[1]+datos[2]+datos[3])) return 3;
31-
return 0;
23+
byte DHT12::read() {
24+
Wire.beginTransmission(_id);
25+
Wire.write(0);
26+
if (Wire.endTransmission() != 0) return 1;
27+
Wire.requestFrom(_id, 5);
28+
for (int i = 0; i < 5; i++) {
29+
datos[i] = Wire.read();
30+
};
31+
delay(50);
32+
if (Wire.available() != 0) return 2;
33+
if (datos[4] != (datos[0] + datos[1] + datos[2] + datos[3])) return 3;
34+
return 0;
3235
}
3336

34-
float DHT12::readTemperature(byte scale)
35-
{
36-
float resultado=0;
37-
byte error=read();
38-
if (error!=0) return (float)error/100;
39-
if (scale==0) scale=_scale;
40-
switch(scale) {
41-
case CELSIUS:
42-
resultado=(datos[2]+(float)datos[3]/10);
43-
break;
44-
case FAHRENHEIT:
45-
resultado=((datos[2]+(float)datos[3]/10)*1.8+32);
46-
break;
47-
case KELVIN:
48-
resultado=(datos[2]+(float)datos[3]/10)+273.15;
49-
break;
50-
};
51-
return resultado;
37+
float DHT12::readTemperature(byte scale) {
38+
float resultado = 0;
39+
byte error = read();
40+
if (error != 0) return (float)error / 100;
41+
if (scale == 0) scale = _scale;
42+
switch (scale) {
43+
case CELSIUS:
44+
resultado = (datos[2] + (float)datos[3] / 10);
45+
break;
46+
case FAHRENHEIT:
47+
resultado = ((datos[2] + (float)datos[3] / 10) * 1.8 + 32);
48+
break;
49+
case KELVIN:
50+
resultado = (datos[2] + (float)datos[3] / 10) + 273.15;
51+
break;
52+
};
53+
return resultado;
5254
}
5355

54-
float DHT12::readHumidity()
55-
{
56-
float resultado;
57-
byte error=read();
58-
if (error!=0) return (float)error/100;
59-
resultado=(datos[0]+(float)datos[1]/10);
60-
return resultado;
56+
float DHT12::readHumidity() {
57+
float resultado;
58+
byte error = read();
59+
if (error != 0) return (float)error / 100;
60+
resultado = (datos[0] + (float)datos[1] / 10);
61+
return resultado;
6162
}
62-

‎examples/Advanced/Blynk/Post-DHT12/DHT12.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
/*
2-
DHT12.h - Library for DHT12 sensor.
3-
v0.0.1 Beta
4-
Created by Bobadas, July 30,2016.
5-
Released into the public domain.
2+
DHT12.h - Library for DHT12 sensor.
3+
v0.0.1 Beta
4+
Created by Bobadas, July 30,2016.
5+
Released into the public domain.
66
*/
77
#ifndef DHT12_h
88
#define DHT12_h
99
#include "Arduino.h"
1010
#include "Wire.h"
1111

12-
#define CELSIUS 1
13-
#define KELVIN 2
14-
#define FAHRENHEIT 3
12+
#define CELSIUS 1
13+
#define KELVIN 2
14+
#define FAHRENHEIT 3
1515

16-
class DHT12
17-
{
18-
public:
19-
DHT12(byte scale=0,byte id=0);
20-
float readTemperature(byte scale=0);
21-
float readHumidity();
22-
private:
23-
byte read();
24-
byte datos[5];
25-
byte _id;
26-
byte _scale;
16+
class DHT12 {
17+
public:
18+
DHT12(byte scale = 0, byte id = 0);
19+
float readTemperature(byte scale = 0);
20+
float readHumidity();
21+
22+
private:
23+
byte read();
24+
byte datos[5];
25+
byte _id;
26+
byte _scale;
2727
};
2828

2929
#endif

0 commit comments

Comments
 (0)