Skip to content
Snippets Groups Projects
Unverified Commit 38a392e3 authored by Gregory Fenton's avatar Gregory Fenton Committed by GitHub
Browse files

Merge pull request #1 from eried/master

Upstream merge 29/05/2020 15:45
parents 687b1187 acbb100d
No related branches found
No related merge requests found
...@@ -55,7 +55,7 @@ private: ...@@ -55,7 +55,7 @@ private:
//uint8_t scan_count; //uint8_t scan_count;
//double scan_progress; //double scan_progress;
//unsigned int scan_index; //unsigned int scan_index;
int16_t waveform_buffer[512]; int16_t waveform_buffer[550];
const encoder_def_t * encoder_def { }; const encoder_def_t * encoder_def { };
//uint8_t enc_type = 0; //uint8_t enc_type = 0;
......
...@@ -439,9 +439,9 @@ static constexpr uint8_t bitmap_icon_debug_data[] = { ...@@ -439,9 +439,9 @@ static constexpr uint8_t bitmap_icon_debug_data[] = {
0xAA, 0x0A, 0xAA, 0x0A,
0x52, 0x01, 0x52, 0x01,
0xAA, 0x12, 0xAA, 0x12,
0x02, 0x18, 0x02, 0x08,
0x02, 0xFC, 0x02, 0xFC,
0x02, 0x18, 0x02, 0x08,
0xFE, 0x13, 0xFE, 0x13,
0x00, 0x00, 0x00, 0x00,
}; };
...@@ -1008,8 +1008,8 @@ static constexpr uint8_t bitmap_icon_receivers_data[] = { ...@@ -1008,8 +1008,8 @@ static constexpr uint8_t bitmap_icon_receivers_data[] = {
0x80, 0x01, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01,
0xF8, 0x1F, 0x98, 0x19,
0xF0, 0x0F, 0xB0, 0x0D,
0xE0, 0x07, 0xE0, 0x07,
0xC0, 0x03, 0xC0, 0x03,
0x83, 0xC1, 0x83, 0xC1,
...@@ -1074,10 +1074,10 @@ static constexpr uint8_t bitmap_icon_scanner_data[] = { ...@@ -1074,10 +1074,10 @@ static constexpr uint8_t bitmap_icon_scanner_data[] = {
0x00, 0x00, 0x00, 0x00,
0x03, 0x01, 0x03, 0x01,
0x80, 0x01, 0x80, 0x01,
0xC3, 0x01, 0xC3, 0x00,
0xE0, 0xFF, 0xE0, 0xFF,
0xEF, 0xFF, 0xEF, 0xFF,
0xC0, 0x01, 0xC0, 0x00,
0x83, 0x01, 0x83, 0x01,
0x00, 0x01, 0x00, 0x01,
0x03, 0x00, 0x03, 0x00,
...@@ -1355,8 +1355,8 @@ static constexpr uint8_t bitmap_icon_transmit_data[] = { ...@@ -1355,8 +1355,8 @@ static constexpr uint8_t bitmap_icon_transmit_data[] = {
0x80, 0x01, 0x80, 0x01,
0xC0, 0x03, 0xC0, 0x03,
0xE0, 0x07, 0xE0, 0x07,
0xF0, 0x0F, 0xB0, 0x0D,
0xF8, 0x1F, 0x98, 0x19,
0x80, 0x01, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01,
...@@ -1396,14 +1396,14 @@ static constexpr Bitmap bitmap_icon_utilities { ...@@ -1396,14 +1396,14 @@ static constexpr Bitmap bitmap_icon_utilities {
}; };
static constexpr uint8_t bitmap_more_data[] = { static constexpr uint8_t bitmap_more_data[] = {
0x18, 0x20,
0x18, 0x00,
0x18, 0x20,
0x18, 0x00,
0xFF, 0x20,
0x7E, 0xA8,
0x3C, 0x70,
0x18, 0x20,
}; };
static constexpr Bitmap bitmap_more { static constexpr Bitmap bitmap_more {
{ 8, 8 }, bitmap_more_data { 8, 8 }, bitmap_more_data
...@@ -1432,22 +1432,22 @@ static constexpr Bitmap bitmap_play { ...@@ -1432,22 +1432,22 @@ static constexpr Bitmap bitmap_play {
}; };
static constexpr uint8_t bitmap_record_data[] = { static constexpr uint8_t bitmap_record_data[] = {
0xE0, 0x07, 0xC0, 0x07,
0xF8, 0x1F, 0xF0, 0x1F,
0xFC, 0x3F, 0xF8, 0x3F,
0xFE, 0x7F, 0xFC, 0x7F,
0xFE, 0x7F, 0xFC, 0x7F,
0xFF, 0xFF, 0x66, 0xCC,
0xFF, 0xFF, 0x56, 0xF7,
0xFF, 0xFF, 0x66, 0xF6,
0xFF, 0xFF, 0x56, 0xF7,
0xFF, 0xFF, 0x56, 0xCC,
0xFF, 0xFF, 0xFC, 0x7F,
0xFE, 0x7F, 0xFC, 0x7F,
0xFE, 0x7F, 0xF8, 0x3F,
0xFC, 0x3F, 0xF0, 0x1F,
0xF8, 0x1F, 0xC0, 0x07,
0xE0, 0x07, 0x00, 0x00,
}; };
static constexpr Bitmap bitmap_record { static constexpr Bitmap bitmap_record {
{ 16, 16 }, bitmap_record_data { 16, 16 }, bitmap_record_data
...@@ -1808,21 +1808,21 @@ static constexpr Bitmap bitmap_sig_tri { ...@@ -1808,21 +1808,21 @@ static constexpr Bitmap bitmap_sig_tri {
}; };
static constexpr uint8_t bitmap_stop_data[] = { static constexpr uint8_t bitmap_stop_data[] = {
0x00, 0x00, 0xFF, 0xFF,
0x00, 0x00, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0x8B, 0xCD,
0xFC, 0x3F, 0xDD, 0xAA,
0xFC, 0x3F, 0xDB, 0xCA,
0xFC, 0x3F, 0xDB, 0xEA,
0xFC, 0x3F, 0xDD, 0xED,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0xFC, 0x3F, 0xFF, 0xFF,
0x00, 0x00, 0xFF, 0xFF,
0x00, 0x00, 0x00, 0x00,
}; };
static constexpr Bitmap bitmap_stop { static constexpr Bitmap bitmap_stop {
......
...@@ -247,8 +247,6 @@ public: ...@@ -247,8 +247,6 @@ public:
parent_pos, parent_pos,
5, 5,
{ {
{ " 1 ", 1 },
{ " 10 ", 10 },
{ " 100", 100 }, { " 100", 100 },
{ " 1k ", 1000 }, { " 1k ", 1000 },
{ " 3k ", 3000 }, /* Approximate SSB bandwidth */ { " 3k ", 3000 }, /* Approximate SSB bandwidth */
......
...@@ -201,6 +201,11 @@ void RecordView::start() { ...@@ -201,6 +201,11 @@ void RecordView::start() {
update_status_display(); update_status_display();
} }
void RecordView::on_hide() {
stop(); // Stop current recording
View::on_hide();
}
void RecordView::stop() { void RecordView::stop() {
if( is_active() ) { if( is_active() ) {
capture_thread.reset(); capture_thread.reset();
......
...@@ -59,6 +59,7 @@ public: ...@@ -59,6 +59,7 @@ public:
void start(); void start();
void stop(); void stop();
void on_hide() override;
bool is_active() const; bool is_active() const;
......
firmware/graphics/icon_debug.png

175 B | W: | H:

firmware/graphics/icon_debug.png

171 B | W: | H:

firmware/graphics/icon_debug.png
firmware/graphics/icon_debug.png
firmware/graphics/icon_debug.png
firmware/graphics/icon_debug.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/icon_receivers.png

141 B | W: | H:

firmware/graphics/icon_receivers.png

147 B | W: | H:

firmware/graphics/icon_receivers.png
firmware/graphics/icon_receivers.png
firmware/graphics/icon_receivers.png
firmware/graphics/icon_receivers.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/icon_scanner.png

151 B | W: | H:

firmware/graphics/icon_scanner.png

153 B | W: | H:

firmware/graphics/icon_scanner.png
firmware/graphics/icon_scanner.png
firmware/graphics/icon_scanner.png
firmware/graphics/icon_scanner.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/icon_transmit.png

144 B | W: | H:

firmware/graphics/icon_transmit.png

151 B | W: | H:

firmware/graphics/icon_transmit.png
firmware/graphics/icon_transmit.png
firmware/graphics/icon_transmit.png
firmware/graphics/icon_transmit.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/more.png

93 B | W: | H:

firmware/graphics/more.png

102 B | W: | H:

firmware/graphics/more.png
firmware/graphics/more.png
firmware/graphics/more.png
firmware/graphics/more.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/record.png

143 B | W: | H:

firmware/graphics/record.png

178 B | W: | H:

firmware/graphics/record.png
firmware/graphics/record.png
firmware/graphics/record.png
firmware/graphics/record.png
  • 2-up
  • Swipe
  • Onion skin
firmware/graphics/stop.png

87 B | W: | H:

firmware/graphics/stop.png

146 B | W: | H:

firmware/graphics/stop.png
firmware/graphics/stop.png
firmware/graphics/stop.png
firmware/graphics/stop.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -112,4 +112,4 @@ f.write("\n") ...@@ -112,4 +112,4 @@ f.write("\n")
f.write("} /* namespace ui */\n\n") f.write("} /* namespace ui */\n\n")
f.write("#endif/*__BITMAP_HPP__*/\n") f.write("#endif/*__BITMAP_HPP__*/\n")
print "Converted " + str(count) + " files" print("Converted " + str(count) + " files")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment