fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Massive changes. Added a quite nice webinterface with live data using WebSockets. Removed the FTP server (wasn't that useful anyways). JSON creating using ArduinoJson instead of String concatenation. Ans, and, and.

Browse Source
This commit is contained in:
Fabian Schlenz
2019-11-16 23:03:13 +01:00
parent 0cddfaf0d9
commit 7c3eb2f605
22 changed files with 625 additions and 2809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/player.h
View File

@ -5,6 +5,10 @@
#include "spi_master.h"
#include "playlist.h"
class Player;
#include "controller.h"
#define SCI_MODE 0x00
#define SCI_STATUS 0x01
#define SCI_BASS 0x02
@ -39,7 +43,6 @@ private:
enum state { uninitialized, idle, playing, stopping,
sleeping, recording };
void _reset();
void _init();
void _wait();
uint16_t _read_control_register(uint8_t address, bool do_wait=true);
void _write_control_register(uint8_t address, uint16_t value, bool do_wait=true);
@ -70,27 +73,32 @@ private:
SPISettings* _spi_settings = &_spi_settings_slow;
File _file;
uint32_t _file_size = 0;
uint8_t _buffer[32];
uint32_t _current_play_position;
Playlist* _current_playlist;
uint32_t _current_play_position = 0;
Playlist* _current_playlist = NULL;
uint _refills;
uint8_t _volume;
uint16_t _stop_delay;
uint32_t _skip_to;
SPIMaster* _spi;
Controller* _controller;
unsigned long _stopped_at;
public:
Player(SPIMaster* s);
void init();
void register_controller(Controller* c);
void vol_up();
void vol_down();
void track_next();
void track_prev();
void set_track(uint8_t track);
bool is_playing();
bool play();
bool play(Playlist* p);
void stop(bool turn_speaker_off=true);
bool loop();
void set_volume(uint8_t vol, bool save = true);
uint32_t position() { return _current_play_position; }
uint8_t volume() { return _volume; }
String position_json();
String json();
};