Merge branch 'next' into hotfix-adsb-position

firmware/application/apps/ui_about_simple.cpp

@@ -31,8 +31,9 @@ namespace ui
                 console.writeln("N0vaPixel,klockee,GullCode");
                 console.writeln("jamesshao8,ITAxReal,rascafr");
                 console.writeln("mcules,dqs105,strijar");
-                console.writeln("zhang00963,RedFox-Fr");
+                console.writeln("zhang00963,RedFox-Fr,aldude999");
                 console.writeln("East2West,fossum,ArjanOnwezen");
+                console.writeln("vXxOinvizioNxX,teixeluis");
                 console.writeln("");
                 break;
 

firmware/application/radio.cpp

@@ -111,14 +111,12 @@ void set_direction(const rf::Direction new_direction) {
 	// Hack to fix the CPLD (clocking ?) bug: toggle CPLD SRAM overlay depending on new direction
 	// Use CPLD's EEPROM config when transmitting
 	// Use the SRAM overlay when receiving
-	if (direction != new_direction) {
-		if (new_direction == rf::Direction::Transmit) {
+
+	// teixeluis: undone "Hack to fix the CPLD (clocking ?) bug".
+	// Apparently with current CPLD code from the hackrf repo,
+	// toggling CPLD overlay should no longer be necessary:
+	if (direction != new_direction && new_direction == rf::Direction::Transmit) {
 		hackrf::cpld::init_from_eeprom();
-		} else {
-			if( !hackrf::cpld::load_sram() ) {
-				chSysHalt();
-			}
-		}
 	}
 	
 	direction = new_direction;

firmware/application/receiver_model.cpp

@@ -171,7 +171,11 @@ void ReceiverModel::enable() {
 	update_baseband_bandwidth();
 	update_sampling_rate();
 	update_modulation();
+	
+	// TODO: would challenge if this should belong to the
+	// receiver_model namespace:
 	update_headphone_volume();
+
 	led_rx.on();
 }
 
@@ -182,6 +186,10 @@ void ReceiverModel::disable() {
 	// TODO: Responsibility for enabling/disabling the radio is muddy.
 	// Some happens in ReceiverModel, some inside radio namespace.
 	radio::disable();
+
+	// TODO: we are doing this repeatedly in different levels of the
+	// call stack. Keeping it for now, but there seem to be too many
+	// redundant calls:
 	led_rx.off();
 }
 

firmware/application/ui/ui_transmitter.cpp

@@ -103,6 +103,7 @@ void TransmitterView::set_transmitting(const bool transmitting) {
 
 void TransmitterView::on_show() {
 	field_frequency.set_value(transmitter_model.tuning_frequency());
+	field_frequency_step.set_by_value(receiver_model.frequency_step());
 
 	field_gain.set_value(transmitter_model.tx_gain());
 	field_amp.set_value(transmitter_model.rf_amp() ? 14 : 0);
@@ -122,6 +123,7 @@ TransmitterView::TransmitterView(
 	
 	add_children({
 		&field_frequency,
+		&field_frequency_step,
 		&text_gain,
 		&field_gain,
 		&button_start,
@@ -158,6 +160,10 @@ TransmitterView::TransmitterView(
 			on_edit_frequency();
 	};
 	
+	field_frequency_step.on_change = [this](size_t, OptionsField::value_t v) {
+		this->field_frequency.set_step(v);
+	};
+
 	field_gain.on_change = [this](uint32_t tx_gain) {
 		on_tx_gain_changed(tx_gain);
 	};

firmware/application/ui/ui_transmitter.hpp

@@ -124,11 +124,11 @@ private:
 	};
 
 	Text text_bw {
-		{ 11 * 8, 1 * 8, 9 * 8, 1 * 16 },
-		"BW:   kHz"
+		{ 18 * 8, 1 * 8, 3 * 8, 1 * 16 },
+		"kHz"
 	};
 	NumberField field_bw {
-		{ 14 * 8, 1 * 8 },
+		{ 15 * 8, 1 * 8 },
 		3,
 		{ 1, 150 },
 		1,
@@ -153,6 +153,10 @@ private:
 		"START"
 	};
 	
+	FrequencyStepView field_frequency_step {
+		{ 10 * 8 - 4, 1 * 8 },
+	};
+
 	void on_tuning_frequency_changed(rf::Frequency f);
 	void on_channel_bandwidth_changed(uint32_t channel_bandwidth);
 	void on_tx_gain_changed(int32_t tx_gain);