Skip to content

Commit

Permalink
Merge pull request #302 from schreibfaul1/dev
Browse files Browse the repository at this point in the history 
Version 2.14
  • Loading branch information
@schreibfaul1
schreibfaul1 authored Oct 8, 2023
2 parents d6affbb + a4c937a commit b354bf2
Show file tree
Hide file tree
Showing 9 changed files with 607 additions and 553 deletions.
Binary file modified Content_on_SD_Card.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies:
type: idf
version: 4.4.5
manifest_hash: c898fc8385345090dc6162cd32eb12b42f8d9b5d9880156fae8e8f128cd6fd17
target: esp32s3
target: esp32
version: 1.0.0
829 changes: 421 additions & 408 deletions lib/tftLib/src/tft.cpp
View file

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions lib/tftLib/src/tft.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// first release on 09/2019
// updated on Aug 17 2023
// updated on Oct 08 2023


#pragma once
Expand All @@ -9,6 +9,7 @@
#include "SPI.h"
#include "SD.h"
#include "vector"

using namespace std;

//#include "fonts/Garamond.h" // default font latin (Western European)
Expand Down Expand Up @@ -124,11 +125,9 @@ virtual size_t write(const uint8_t *buffer, size_t size);
void fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color);
void drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color);
void fillCircle(int16_t Xm, int16_t Ym, uint16_t r, uint16_t color);
void pushColor(uint16_t color);
boolean drawBmpFile(fs::FS &fs, const char * path, uint16_t x=0, uint16_t y=0, uint16_t maxWidth=0, uint16_t maxHeight=0, uint16_t offX=0, uint16_t offY=0);
boolean drawGifFile(fs::FS &fs, const char * path, uint16_t x, uint16_t y, uint8_t repeat);
boolean drawJpgFile(fs::FS &fs, const char * path, uint16_t x=0, uint16_t y=0, uint16_t maxWidth=0, uint16_t maxHeight=0, uint16_t offX=0, uint16_t offY=0);
uint16_t color565(uint8_t r, uint8_t g, uint8_t b);
size_t writeText(const uint8_t *str, int16_t maxWidth = -1, int16_t maxHeight = -1, boolean noWrap = false);

inline void setTextColor(uint16_t color){_textcolor=color;}
Expand Down Expand Up @@ -331,8 +330,7 @@ virtual size_t write(const uint8_t *buffer, size_t size);

// Transaction API not used by GFX
void setAddrWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
void write16BitColor(uint16_t color);
void writePixel(uint16_t color);
void write24BitColor(uint16_t color);
void writePixels(uint16_t * colors, uint32_t len);
void writeColor(uint16_t color, uint32_t len);

Expand Down
3 changes: 2 additions & 1 deletion miniwebradio16MB.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
phy_init, data, phy, 0x9000, 0x7000,
nvs, data, nvs, 0x10000, 0x40000,
factory, app, factory, 0x50000, 0xF90000,
factory, app, factory, 0x50000, 0x400000,
ffat, data, fat, 0x450000, 0xB90000,
coredump, data, coredump, 0xFE0000, 0x10000,
3 changes: 2 additions & 1 deletion miniwebradio8MB.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Name, Type, SubType, Offset, Size, Flags
phy_init, data, phy, 0x9000, 0x7000,
nvs, data, nvs, 0x10000, 0x40000,
factory, app, factory, 0x50000, 0x7A0000,
factory, app, factory, 0x50000, 0x400000,
ffat, data, fat, 0x450000, 0x3A0000,
coredump, data, coredump, 0x7F0000, 0x10000,

4 changes: 2 additions & 2 deletions platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ build_unflags =


[env:esp32s3]
board_build.partitions = miniwebradio4MB.csv ; 4MB Flash
;board_build.partitions = miniwebradio8MB.csv ; 8MB Flash
;board_build.partitions = miniwebradio4MB.csv ; 4MB Flash
board_build.partitions = miniwebradio8MB.csv ; 8MB Flash
;board_build.partitions = miniwebradio16MB.csv ; 16MB Flash

board = esp32-12k ; 4MB Flash, 8MB quad PSRAM
Expand Down
190 changes: 96 additions & 94 deletions src/common.h
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// created: 10.Feb.2022
// updated: 23.Sep.2023
// updated: 08.Oct.2023

#pragma once
#pragma GCC optimize("Os") // optimize for code size

#define _SSID "mySSID" // Your WiFi credentials here
#define _PW "myWiFiPassword"
#define DECODER 1 // (0)VS1053 , (1)MAX98357A PCM5102A... (2)AC101 (3)ES8388 (4)WM8978
#define TFT_CONTROLLER 5 // (0)ILI9341, (1)HX8347D, (2)ILI9486a, (3)ILI9486b, (4)ILI9488, (5)ST7796, (6)ST7796RPI
#define TFT_CONTROLLER 0 // (0)ILI9341, (1)HX8347D, (2)ILI9486a, (3)ILI9486b, (4)ILI9488, (5)ST7796, (6)ST7796RPI
#define DISPLAY_INVERSION 0 // (0) off (1) on
#define TFT_ROTATION 1 // 1 or 3 (landscape)
#define TFT_FREQUENCY 80000000 // 27000000, 40000000, 80000000
#define TP_VERSION 5 // (0)ILI9341, (1)ILI9341RPI, (2)HX8347D, (3)ILI9486, (4)ILI9488, (5)ST7796, (3)ST7796RPI
#define TP_ROTATION 1 // 1 or 3 (landscape)
#define TFT_FREQUENCY 80000000 // 80000000, 40000000, 27000000, 20000000, 10000000
#define TP_VERSION 0 // (0)ILI9341, (1)ILI9341RPI, (2)HX8347D, (3)ILI9486, (4)ILI9488, (5)ST7796, (3)ST7796RPI
#define TP_ROTATION 3 // 1 or 3 (landscape)
#define AUDIOTASK_CORE 1 // 0 or 1
#define AUDIOTASK_PRIO 2 // 0 ... 24 Priority of the Task (0...configMAX_PRIORITIES -1)
#define SDMMC_FREQUENCY 80000000 // 40000000, 2000000, 10000000, not every SD Card will run at 40MHz
#define SDMMC_FREQUENCY 80000000 // 80000000, 40000000, 27000000, 20000000, 10000000 not every SD Card will run at 80MHz
#define FTP_USERNAME "esp32" // user and pw in FTP Client
#define FTP_PASSWORD "esp32"
#define CONN_TIMEOUT 500 // unencrypted connection timeout in ms (http://...)
Expand All @@ -29,6 +29,7 @@
#include <SPI.h>
#include <SD_MMC.h>
#include <FS.h>
#include <FFat.h>
#include <Wire.h>
#include <ESPmDNS.h>
#include <WiFiClient.h>
Expand Down Expand Up @@ -142,96 +143,97 @@
/**********************************************************************************************************************/

// //prototypes (main.cpp)
boolean defaultsettings();
boolean saveStationsToNVS();
boolean saveDefaultIRbuttonsToNVS();
void saveIRbuttonsToNVS();
void loadIRbuttonsFromNVS();
void updateSettings();
void urldecode(char *str);
const char* SD_stringifyDirContent(String path);
void setTFTbrightness(uint8_t duty);
void showHeadlineVolume();
void showHeadlineTime(bool complete = true);
void showHeadlineItem(uint8_t idx);
void showFooterIPaddr();
void showFooterStaNr();
void showFooterRSSI(boolean show = false);
void fall_asleep();
void wake_up();
void setRTC(const char* TZString);
void vector_clear_and_shrink(vector<char*>&vec);
void dlna_items_vector_clear_ans_shrink();
void updateSleepTime(boolean noDecrement = false);
void showVolumeBar();
void showBrightnessBar();
void showFooter();
void display_info(const char *str, int32_t xPos, int32_t yPos, uint16_t color, uint16_t margin_l, uint16_t margin_r, uint16_t winWidth, uint16_t winHeight);
void showStreamTitle(const char* streamTitle);
void showVUmeter();
void updateVUmeter();
void showLogoAndStationName();
void showStationName(String sn);
void showStationLogo(String ln);
void showFileLogo(uint8_t state);
void showFileName(const char* fname);
void showFileNumber();
void showStationsList(uint16_t staListNr);
void display_time(boolean showall = false);
void display_alarmDays(uint8_t ad, boolean showall=false);
void display_alarmtime(int8_t xy = 0, int8_t ud = 0, boolean showall = false);
void display_sleeptime(int8_t ud = 0);
boolean drawImage(const char* path, uint16_t posX, uint16_t posY, uint16_t maxWidth = 0 , uint16_t maxHeigth = 0);
bool SD_listDir(const char* path, boolean audioFilesOnly, boolean withoutDirs);
boolean isAudio(File file);
boolean isPlaylist(File file);
bool connectToWiFi();
void openAccessPoint();
const char* byte_to_binary(int8_t x);
uint32_t simpleHash(const char* str);
void trim(char *s);
bool startsWith (const char* base, const char* str);
bool endsWith (const char* base, const char* str);
int32_t indexOf (const char* base, const char* str, int32_t startIndex);
int32_t lastIndexOf(const char* haystack, const char needle);
boolean strCompare(char* str1, char* str2);
boolean strCompare(const char* str1, char* str2);
char* ps_strdup(const char* str);
int16_t strlenUTF8(const char* str);
int32_t map_l(int32_t x, int32_t in_min, int32_t in_max, int32_t out_min, int32_t out_max);
void SerialPrintflnCut(const char* item, const char* color, const char* str);
const char* scaleImage(const char* path);
void setVolume(uint8_t vol);
boolean defaultsettings();
boolean saveStationsToNVS();
boolean saveDefaultIRbuttonsToNVS();
void saveIRbuttonsToNVS();
void loadIRbuttonsFromNVS();
void updateSettings();
void urldecode(char* str);
const char* SD_stringifyDirContent(String path);
void setTFTbrightness(uint8_t duty);
void showHeadlineVolume();
void showHeadlineTime(bool complete = true);
void showHeadlineItem(uint8_t idx);
void showFooterIPaddr();
void showFooterStaNr();
void showFooterRSSI(boolean show = false);
void fall_asleep();
void wake_up();
void setRTC(const char* TZString);
void vector_clear_and_shrink(vector<char*>& vec);
void dlna_items_vector_clear_ans_shrink();
boolean copySDtoFFat(const char* path);
void updateSleepTime(boolean noDecrement = false);
void showVolumeBar();
void showBrightnessBar();
void showFooter();
void display_info(const char* str, int32_t xPos, int32_t yPos, uint16_t color, uint16_t margin_l, uint16_t margin_r, uint16_t winWidth, uint16_t winHeight);
void showStreamTitle(const char* streamTitle);
void showVUmeter();
void updateVUmeter();
void showLogoAndStationName();
void showStationName(String sn);
void showStationLogo(String ln);
void showFileLogo(uint8_t state);
void showFileName(const char* fname);
void showFileNumber();
void showStationsList(uint16_t staListNr);
void display_time(boolean showall = false);
void display_alarmDays(uint8_t ad, boolean showall = false);
void display_alarmtime(int8_t xy = 0, int8_t ud = 0, boolean showall = false);
void display_sleeptime(int8_t ud = 0);
boolean drawImage(const char* path, uint16_t posX, uint16_t posY, uint16_t maxWidth = 0, uint16_t maxHeigth = 0);
bool SD_listDir(const char* path, boolean audioFilesOnly, boolean withoutDirs);
boolean isAudio(File file);
boolean isPlaylist(File file);
bool connectToWiFi();
void openAccessPoint();
const char* byte_to_binary(int8_t x);
uint32_t simpleHash(const char* str);
void trim(char* s);
bool startsWith(const char* base, const char* str);
bool endsWith(const char* base, const char* str);
int32_t indexOf(const char* base, const char* str, int32_t startIndex);
int32_t lastIndexOf(const char* haystack, const char needle);
boolean strCompare(char* str1, char* str2);
boolean strCompare(const char* str1, char* str2);
char* x_ps_strdup(const char* str);
int16_t strlenUTF8(const char* str);
int32_t map_l(int32_t x, int32_t in_min, int32_t in_max, int32_t out_min, int32_t out_max);
void SerialPrintflnCut(const char* item, const char* color, const char* str);
const char* scaleImage(const char* path);
void setVolume(uint8_t vol);
inline uint8_t getvolume();
uint8_t downvolume();
uint8_t upvolume();
void setStation(uint16_t sta);
void nextStation();
void prevStation();
void StationsItems();
void setStationViaURL(const char* url);
void changeBtn_pressed(uint8_t btnNr);
void changeBtn_released(uint8_t btnNr);
void savefile(const char* fileName, uint32_t contentLength);
String setTone();
String setI2STone();
void SD_playFile(const char* path, uint32_t resumeFilePos = 0, bool showFN = true);
void SD_playFolder(const char* folderPath, bool showFN);
bool SD_rename(const char* src , const char* dest);
bool SD_newFolder(const char* folderPathName);
bool SD_delete(const char* itemPath);
void processPlaylist(boolean first = false);
void changeState(int32_t state);
void connecttohost(const char* host);
void connecttoFS(const char* filename, uint32_t resumeFilePos = 0);
void stopSong();
uint8_t downvolume();
uint8_t upvolume();
void setStation(uint16_t sta);
void nextStation();
void prevStation();
void StationsItems();
void setStationViaURL(const char* url);
void changeBtn_pressed(uint8_t btnNr);
void changeBtn_released(uint8_t btnNr);
void savefile(const char* fileName, uint32_t contentLength);
String setTone();
String setI2STone();
void SD_playFile(const char* path, uint32_t resumeFilePos = 0, bool showFN = true);
void SD_playFolder(const char* folderPath, bool showFN);
bool SD_rename(const char* src, const char* dest);
bool SD_newFolder(const char* folderPathName);
bool SD_delete(const char* itemPath);
void processPlaylist(boolean first = false);
void changeState(int32_t state);
void connecttohost(const char* host);
void connecttoFS(const char* filename, uint32_t resumeFilePos = 0);
void stopSong();
void IRAM_ATTR headphoneDetect();
int32_t DLNA_setCurrentServer(String serverName);
void DLNA_showServer();
void DLNA_browseServer(String objectId, uint8_t level);
void DLNA_getFileItems(String uri);
void DLNA_showContent(String objectId, uint8_t level);
void showDlnaItemsList(uint8_t level, uint16_t itemNr);
int32_t DLNA_setCurrentServer(String serverName);
void DLNA_showServer();
void DLNA_browseServer(String objectId, uint8_t level);
void DLNA_getFileItems(String uri);
void DLNA_showContent(String objectId, uint8_t level);
void showDlnaItemsList(uint8_t level, uint16_t itemNr);

//prototypes (audiotask.cpp)
void audioInit();
Expand Down
Loading

0 comments on commit b354bf2

Please sign in to comment.