hendrik
/
esp32-node
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

use hardware i2s, fix various minor things

main
Hendrik Langer 7 years ago
parent
d9b33cb144
commit
03b28fc7c5
3 changed files with 104 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/main.cpp
  2. 110
      src/screen.cpp
  3. 26
      src/screen.h

19
src/main.cpp
View File

@ -54,7 +54,7 @@
#include "rotary.h"
#include "screen.h"
U8G2_SSD1306_128X64_NONAME_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 15, /* data=*/ 4, /* reset=*/ 16);
U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 16, /* clock=*/ 15, /* data=*/ 4);
//Create a new Basecamp instance called iot
Basecamp iot;
@ -62,6 +62,7 @@ Basecamp iot;
WiFiUDP ntpUDP;
NTPClient timeClient(ntpUDP, "de.pool.ntp.org", 3600, 60000);
char timeStr[20];
char weatherStr[32];
BME280 bme280;
MP3 mp3;
@ -70,6 +71,7 @@ Screen* screen;
menuType menuChange = eNone;
uint32_t lastButtonPress = 0;
uint32_t lastUpdate = 0;
//Variables for the sensor and the battery
static const int buttonPin = 0;
@ -283,17 +285,24 @@ void rotation(int i, int direction, int buttonPressed) {
void loop()
{
timeClient.update();
timeClient.getFormattedTime().toCharArray(timeStr, 50);
if(millis() - lastUpdate >= 1000) {
lastUpdate = millis();
timeClient.update();
timeClient.getFormattedTime().toCharArray(timeStr, 50);
sprintf(weatherStr, "%.1f°C %.1f%% %.0fhPa", bme280.readTemperature(), bme280.readHumidity(), bme280.readPressure());
}
if (menuChange != eNone) {
delete screen;
if (menuChange == eMainScreen) screen = new MainScreen();
if (menuChange == eMainMenu) screen = new MainMenu();
else if (menuChange == eMainMenu) screen = new MainMenu();
else if (menuChange == eStationMenu) screen = new StationMenu();
else screen = new MainScreen();
menuChange = eNone;
}
screen->draw();
delay(200);
delay(100);
}

110
src/screen.cpp
View File

@ -22,7 +22,7 @@ void SelectionList::draw() {
u8g2.drawLine(0,header_height,u8g2.getDisplayWidth(),header_height);
/* draw menu items */
u8g2.setFont(u8g2_font_9x18B_tr);
u8g2.setFont(u8g2_font_8x13B_tr);
int length = std::min(visible, (uint8_t)string_list.size());
for (int i=0; i<length; i++) {
u8g2.drawUTF8(item_x_offset,header_height+2+(i+1)*item_height,string_list[top_item+i].c_str());
@ -58,19 +58,10 @@ uint8_t SelectionList::select() {
MainMenu::MainMenu() {
string_list = {
"PLAY",
"80s Planet",
"Left Coast 70s",
"laradio Ska",
"French Quarter Jams",
"Radio Stations",
"test",
"test3",
"Radio Kol Yavne",
"ROCKIN626.COM",
"Jive Time Radio",
"Live Ireland",
"Ye Ol Celtic Pub",
"Gone Country - NZCMR",
"Return"};
"« Return"};
if (mp3.playing) {
string_list[0] = "STOP";
}
@ -87,39 +78,77 @@ uint8_t MainMenu::select() {
}
break;
case 1:
mp3.start("http://streaming.shoutcast.com/80sPlanet?lang=en-US");
menuChange = eStationMenu;
return current_pos;
break;
case 2:
mp3.start("http://ice1.somafm.com/seventies-128-mp3");
iot.mqtt.publish(topic.c_str(), 1, true, "test" );
break;
case 3:
mp3.start("http://streaming.radionomy.com/laradiostrong?lang=de");
iot.mqtt.publish(topic.c_str(), 1, true, "foo" );
break;
case 4:
menuChange = eMainScreen;
break;
default:
Serial.println("unknown entry selected");
break;
}
menuChange = eMainScreen;
return current_pos;
}
StationMenu::StationMenu() {
string_list = {
"80s Planet",
"Left Coast 70s",
"laradio Ska",
"French Quarter Jams",
"Radio Kol Yavne",
"ROCKIN626.COM",
"Jive Time Radio",
"Live Ireland",
"Ye Ol Celtic Pub",
"Gone Country - NZCMR",
"« Return"};
}
uint8_t StationMenu::select() {
switch (current_pos) {
case 0:
mp3.start("http://streaming.shoutcast.com/80sPlanet?lang=en-US");
break;
case 1:
mp3.start("http://ice1.somafm.com/seventies-128-mp3");
break;
case 2:
mp3.start("http://streaming.radionomy.com/laradiostrong?lang=de");
break;
case 3:
mp3.start("http://184.171.163.20:8162/stream");
break;
case 5:
iot.mqtt.publish(topic.c_str(), 1, true, "test" );
case 6:
iot.mqtt.publish(topic.c_str(), 1, true, "foo" );
case 7:
case 4:
mp3.start("http://212.83.129.92:8028/;?type=http&nocache=683");
break;
case 8:
case 5:
mp3.start("http://192.99.4.210:3574/stream");
break;
case 9:
case 6:
mp3.start("http://188.165.192.5:8279/stream?icy=http");
break;
case 10:
case 7:
mp3.start("http://69.167.190.234:8080/stream");
break;
case 11:
case 8:
mp3.start("http://192.240.102.133:11790/stream");
break;
case 12:
case 9:
mp3.start("http://192.99.41.102:5044/stream");
break;
case 10:
menuChange = eMainMenu;
return current_pos;
break;
default:
Serial.println("unknown entry selected");
break;
@ -138,14 +167,14 @@ void MainScreen::draw() {
if(millis() - lastVolumeChange <= 1000) {
//u8g2.drawXBMP(0,0, IMG_1872_width, IMG_1872_height, IMG_1872_bits);
u8g2.setFont(u8g2_font_inb19_mf);
u8g2.drawStr(20, 20, "Volume");
u8g2.drawStr(15, 20, "Volume");
u8g2.drawRBox(10, 28, 108, 22, 5);
u8g2.setDrawColor(0);
u8g2.drawBox(14+volume, 31, 100-volume, 14);
u8g2.drawBox(14+volume, 31, 100-volume, 16);
char volumeStr[6];
sprintf(volumeStr, "%d %%", volume);
u8g2.setFont(u8g2_font_crox3cb_mf);
sprintf(volumeStr, "%3d %%", volume);
u8g2.setFont(u8g2_font_profont17_mf);
u8g2.setFontMode(1);
u8g2.setDrawColor(2);
u8g2.drawStr(40, 45, volumeStr);
@ -155,20 +184,27 @@ void MainScreen::draw() {
u8g2.setFont(u8g2_font_inb19_mf);
u8g2.drawStr(0, 20, timeStr);
char weather[32];
u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font
sprintf(weather, "%.1f°C %.1f%% %.0fhPa", bme280.readTemperature(), bme280.readHumidity(), bme280.readPressure());
u8g2.drawUTF8(0, 30, weather);
u8g2.drawUTF8(0, 30, weatherStr);
u8g2.setFont(u8g2_font_prospero_bold_nbp_tf); // choose a suitable font
u8g2_uint_t width = u8g2.getUTF8Width(titleStr); // calculate the pixel width of the text
if (width > u8g2.getDisplayWidth()) {
u8g2_uint_t x = titleStr_offset;
do { // repeated drawing of the scrolling text...
u8g2.drawUTF8(x, 54, titleStr); // draw the scolling text
x += width; // add the pixel width of the scrolling text
} while( x < u8g2.getDisplayWidth() ); // draw again until the complete display is filled
// repeated drawing of the scrolling text...
u8g2.drawUTF8(titleStr_offset, 54, titleStr); // draw the scolling text
titleStr_offset-=4; // scroll by one pixel
if ( (u8g2_uint_t)titleStr_offset < (u8g2_uint_t)-width )
titleStr_offset = 0; // start over again // u8g2.getDisplayWidth()
titleStr_offset-=4; // scroll by one pixel
if ( (u8g2_uint_t)titleStr_offset < (u8g2_uint_t)-width )
titleStr_offset = 0; // start over again
} else {
u8g2.drawUTF8((u8g2.getDisplayWidth()-width)/2, 54, titleStr);
}
}
u8g2.sendBuffer();
// bme280.printValues();

26
src/screen.h
View File

@ -20,10 +20,11 @@
#include "BME280.h"
#include "image.h"
enum menuType { eNone=0, eMainScreen, eMainMenu };
enum menuType { eNone=0, eMainScreen, eMainMenu, eStationMenu };
extern U8G2_SSD1306_128X64_NONAME_F_SW_I2C u8g2;
extern U8G2_SSD1306_128X64_NONAME_F_HW_I2C u8g2;
extern char timeStr[];
extern char weatherStr[];
extern BME280 bme280;
extern MP3 mp3;
extern menuType menuChange;
@ -67,13 +68,6 @@ class SelectionList : public Screen {
uint8_t visible = 4;
};
class MainMenu : public SelectionList {
public:
MainMenu();
uint8_t select(void) override;
private:
};
class MainScreen : public Screen {
public:
void draw(void) override;
@ -87,4 +81,18 @@ class MainScreen : public Screen {
uint8_t volume = 20;
};
class MainMenu : public SelectionList {
public:
MainMenu();
uint8_t select(void) override;
private:
};
class StationMenu : public SelectionList {
public:
StationMenu();
uint8_t select(void) override;
private:
};
#endif /* _SCREEN_H */

Write Preview
Loading…
Cancel
Save