Formatted code (#1007)

* Updated style

* Updated files

* fixed new line

* Updated spacing

* File fix WIP

* Updated to clang 13

* updated comment style

* Removed old comment code
This commit is contained in:
jLynx 2023-05-19 08:16:05 +12:00 committed by GitHub
parent 7aca7ce74d
commit 033c4e9a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
599 changed files with 70746 additions and 66896 deletions

View file

@ -1,7 +1,7 @@
/*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2016 Furrtek
*
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
@ -39,142 +39,133 @@
namespace ui {
class NumbersStationView : public View {
public:
NumbersStationView(NavigationView& nav);
~NumbersStationView();
NumbersStationView(const NumbersStationView&) = delete;
NumbersStationView(NumbersStationView&&) = delete;
NumbersStationView& operator=(const NumbersStationView&) = delete;
NumbersStationView& operator=(NumbersStationView&&) = delete;
public:
NumbersStationView(NavigationView& nav);
~NumbersStationView();
void focus() override;
std::string title() const override { return "Station"; };
private:
NavigationView& nav_;
// Sequencing state machine
enum segments {
IDLE = 0,
ANNOUNCE,
MESSAGE,
SIGNOFF
};
Style style_red {
.font = font::fixed_8x16,
.background = Color::black(),
.foreground = Color::red()
};
typedef struct {
char code;
uint32_t index;
uint32_t length;
uint32_t samplerate;
} wav_file_t;
struct voice_t {
std::string dir;
std::vector<wav_file_t> available_wavs;
bool accent;
};
std::vector<voice_t> voices { };
voice_t * current_voice { };
struct wav_file_list_t {
std::string name;
bool required;
char code;
};
const std::vector<wav_file_list_t> file_names = {
{ "0", true, '0' },
{ "1", true, '1' },
{ "2", true, '2' },
{ "3", true, '3' },
{ "4", true, '4' },
{ "5", true, '5' },
{ "6", true, '6' },
{ "7", true, '7' },
{ "8", true, '8' },
{ "9", true, '9' },
{ "announce", false, 'A' }
};
segments segment { IDLE };
bool armed { false };
bool file_error { false };
// const uint8_t month_table[12] = { 0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4 };
// const char * day_of_week[7] = { "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" };
std::unique_ptr<WAVFileReader> reader { };
uint8_t code_index { 0 }, announce_loop { 0 };
uint32_t sample_counter { 0 };
uint32_t sample_length { 0 };
int8_t audio_buffer[1024] { };
uint32_t pause { 0 };
bool armed_blink { false };
SignalToken signal_token_tick_second { };
NumbersStationView(const NumbersStationView&) = delete;
NumbersStationView(NumbersStationView&&) = delete;
NumbersStationView& operator=(const NumbersStationView&) = delete;
NumbersStationView& operator=(NumbersStationView&&) = delete;
wav_file_t * get_wav(uint32_t index);
bool check_wav_validity(const std::string dir, const std::string file);
void on_voice_changed(size_t index);
void on_tick_second();
void prepare_audio();
void start_tx();
Labels labels {
{ { 2 * 8, 5 * 8 }, "Voice: Flags:", Color::light_grey() },
{ { 1 * 8, 8 * 8 }, "Code:", Color::light_grey() }
};
OptionsField options_voices {
{ 8 * 8, 1 * 8 },
4,
{ }
};
Text text_voice_flags {
{ 19 * 8, 1 * 8, 2 * 8, 16 },
""
};
SymField symfield_code {
{ 1 * 8, 10 * 8 },
25,
SymField::SYMFIELD_DEF
};
Checkbox check_armed {
{ 2 * 8, 13 * 16 },
5,
"Armed"
};
/*Button button_tx_now {
{ 18 * 8, 13 * 16, 10 * 8, 32 },
"TX now"
};*/
Button button_exit {
{ 21 * 8, 16 * 16, 64, 32 },
"Exit"
};
MessageHandlerRegistration message_handler_fifo_signal {
Message::ID::RequestSignal,
[this](const Message* const p) {
const auto message = static_cast<const RequestSignalMessage*>(p);
if (message->signal == RequestSignalMessage::Signal::FillRequest) {
this->prepare_audio();
}
}
};
void focus() override;
std::string title() const override { return "Station"; };
private:
NavigationView& nav_;
// Sequencing state machine
enum segments {
IDLE = 0,
ANNOUNCE,
MESSAGE,
SIGNOFF
};
Style style_red{
.font = font::fixed_8x16,
.background = Color::black(),
.foreground = Color::red()};
typedef struct {
char code;
uint32_t index;
uint32_t length;
uint32_t samplerate;
} wav_file_t;
struct voice_t {
std::string dir;
std::vector<wav_file_t> available_wavs;
bool accent;
};
std::vector<voice_t> voices{};
voice_t* current_voice{};
struct wav_file_list_t {
std::string name;
bool required;
char code;
};
const std::vector<wav_file_list_t> file_names = {
{"0", true, '0'},
{"1", true, '1'},
{"2", true, '2'},
{"3", true, '3'},
{"4", true, '4'},
{"5", true, '5'},
{"6", true, '6'},
{"7", true, '7'},
{"8", true, '8'},
{"9", true, '9'},
{"announce", false, 'A'}};
segments segment{IDLE};
bool armed{false};
bool file_error{false};
// const uint8_t month_table[12] = { 0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4 };
// const char * day_of_week[7] = { "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" };
std::unique_ptr<WAVFileReader> reader{};
uint8_t code_index{0}, announce_loop{0};
uint32_t sample_counter{0};
uint32_t sample_length{0};
int8_t audio_buffer[1024]{};
uint32_t pause{0};
bool armed_blink{false};
SignalToken signal_token_tick_second{};
wav_file_t* get_wav(uint32_t index);
bool check_wav_validity(const std::string dir, const std::string file);
void on_voice_changed(size_t index);
void on_tick_second();
void prepare_audio();
void start_tx();
Labels labels{
{{2 * 8, 5 * 8}, "Voice: Flags:", Color::light_grey()},
{{1 * 8, 8 * 8}, "Code:", Color::light_grey()}};
OptionsField options_voices{
{8 * 8, 1 * 8},
4,
{}};
Text text_voice_flags{
{19 * 8, 1 * 8, 2 * 8, 16},
""};
SymField symfield_code{
{1 * 8, 10 * 8},
25,
SymField::SYMFIELD_DEF};
Checkbox check_armed{
{2 * 8, 13 * 16},
5,
"Armed"};
/*Button button_tx_now {
{ 18 * 8, 13 * 16, 10 * 8, 32 },
"TX now"
};*/
Button button_exit{
{21 * 8, 16 * 16, 64, 32},
"Exit"};
MessageHandlerRegistration message_handler_fifo_signal{
Message::ID::RequestSignal,
[this](const Message* const p) {
const auto message = static_cast<const RequestSignalMessage*>(p);
if (message->signal == RequestSignalMessage::Signal::FillRequest) {
this->prepare_audio();
}
}};
};
} /* namespace ui */
#endif/*__UI_NUMBERS_H__*/
#endif /*__UI_NUMBERS_H__*/