diff --git a/firmware/baseband/audio_output.cpp b/firmware/baseband/audio_output.cpp index ee16322d1..b52dc312b 100644 --- a/firmware/baseband/audio_output.cpp +++ b/firmware/baseband/audio_output.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. + * Copyright (C) 2016 Furrtek * * This file is part of PortaPack. * diff --git a/firmware/baseband/audio_output.hpp b/firmware/baseband/audio_output.hpp index bd0455f68..0eb1d961f 100644 --- a/firmware/baseband/audio_output.hpp +++ b/firmware/baseband/audio_output.hpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. + * Copyright (C) 2016 Furrtek * * This file is part of PortaPack. * diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp index 8b9ef9eb1..30b9c26a7 100644 --- a/firmware/common/message.hpp +++ b/firmware/common/message.hpp @@ -91,6 +91,8 @@ public: FIFOSignal = 52, FIFOData = 53, + + AudioLevel = 54, MAX }; @@ -628,6 +630,16 @@ public: uint32_t range = 0; }; +class AudioLevelMessage : public Message { +public: + constexpr AudioLevelMessage( + ) : Message { ID::AudioLevel } + { + } + + uint32_t value = 0; +}; + class AudioTXConfigMessage : public Message { public: constexpr AudioTXConfigMessage( diff --git a/firmware/common/spi_image.hpp b/firmware/common/spi_image.hpp index aac1982cd..59cd0f08e 100644 --- a/firmware/common/spi_image.hpp +++ b/firmware/common/spi_image.hpp @@ -83,6 +83,7 @@ constexpr image_tag_t image_tag_ook { 'P', 'O', 'O', 'K' }; constexpr image_tag_t image_tag_adsb_tx { 'P', 'A', 'D', 'S' }; constexpr image_tag_t image_tag_replay { 'P', 'R', 'E', 'P' }; constexpr image_tag_t image_tag_fsktx { 'P', 'F', 'S', 'K' }; +constexpr image_tag_t image_tag_mic_tx { 'P', 'M', 'T', 'X' }; constexpr image_tag_t image_tag_noop { 'P', 'N', 'O', 'P' }; diff --git a/firmware/common/ui.hpp b/firmware/common/ui.hpp index 48d5e169b..b6777f355 100644 --- a/firmware/common/ui.hpp +++ b/firmware/common/ui.hpp @@ -67,18 +67,30 @@ struct Color { static constexpr Color red() { return { 255, 0, 0 }; } + static constexpr Color dark_red() { + return { 127, 0, 0 }; + } static constexpr Color orange() { - return { 255, 127, 0 }; + return { 255, 175, 0 }; + } + static constexpr Color dark_orange() { + return { 127, 88, 0 }; } static constexpr Color yellow() { return { 255, 255, 0 }; } + static constexpr Color dark_yellow() { + return { 127, 127, 0 }; + } static constexpr Color green() { return { 0, 255, 0 }; } + static constexpr Color dark_green() { + return { 0, 127, 0 }; + } static constexpr Color blue() { return { 0, 0, 255 }; @@ -95,11 +107,9 @@ struct Color { static constexpr Color light_grey() { return { 127, 127, 127 }; } - static constexpr Color grey() { return { 91, 91, 91 }; } - static constexpr Color dark_grey() { return { 63, 63, 63 }; } diff --git a/firmware/common/wm8731.cpp b/firmware/common/wm8731.cpp index f5c454c36..8ea783c11 100644 --- a/firmware/common/wm8731.cpp +++ b/firmware/common/wm8731.cpp @@ -29,7 +29,7 @@ void WM8731::init() { reset(); write(PowerDownControl { - .lineinpd = 1, + .lineinpd = 1, .micpd = 0, .adcpd = 0, .dacpd = 0, @@ -83,7 +83,7 @@ void WM8731::init() { .reserved0 = 0, }); - set_line_in_volume(0.0_dB); + //set_line_in_volume(0.0_dB); headphone_mute(); } diff --git a/firmware/portapack-h1-havoc.bin b/firmware/portapack-h1-havoc.bin index a488f07c1..c6ee165a9 100644 Binary files a/firmware/portapack-h1-havoc.bin and b/firmware/portapack-h1-havoc.bin differ