CTCSS in soundboard. 24 jammer chs instead of 9.

Soundboard random mode now cares about loop option.
Started documenting UI.

firmware/baseband/proc_audiotx.cpp

@@ -37,18 +37,13 @@ void AudioTXProcessor::execute(const buffer_c8_t& buffer){
 	//ai = 0;
 	for (size_t i = 0; i<buffer.count; i++) {
 		
-		// Audio preview sample generation: 1536000/divider = samplerate
+		// Audio preview sample generation @ 1536000/divider
 		if (!as) {
 			as = divider;
-			audio_fifo.out(sample);
+			audio_fifo.out(out_sample);
+			sample = (int32_t)out_sample;
 			//preview_audio_buffer.p[ai++] = sample << 8;
 			
-			if (ctcss_enabled) {
-				ctcss_sample = sine_table_i8[(ctcss_phase & 0x03FC0000) >> 18];
-				int16_t mix = (sample * 218) + (ctcss_sample * 37);		// ~15%
-				sample = mix >> 8;
-			}
-			
 			if ((audio_fifo.len() < 1024) && (asked == false)) {
 				// Ask application to fill up fifo
 				sigmessage.signaltype = 1;
@@ -59,36 +54,38 @@ void AudioTXProcessor::execute(const buffer_c8_t& buffer){
 			as--;
 		}
 		
-		ctcss_phase += ctcss_phase_inc;
+		if (ctcss_enabled) {
+			ctcss_sample = sine_table_i8[(ctcss_phase & 0xFF000000U) >> 24];
+			sample_mixed = ((sample * 217) + (ctcss_sample * 38)) / 256;	// ~15%
+			ctcss_phase += ctcss_phase_inc;
+		} else {
+			sample_mixed = sample;
+		}
 		
 		// FM
-		frq = sample * bw;
+		delta = sample_mixed * fm_delta;
 		
-		phase = (phase + frq);
-		sphase = phase + (64 << 18);
+		phase += delta;
+		sphase = phase + (64 << 24);
 
-		re = (sine_table_i8[(sphase & 0x03FC0000) >> 18]);
-		im = (sine_table_i8[(phase & 0x03FC0000) >> 18]);
+		re = (sine_table_i8[(sphase & 0xFF000000U) >> 24]);
+		im = (sine_table_i8[(phase & 0xFF000000U) >> 24]);
 		
-		buffer.p[i] = {(int8_t)re, (int8_t)im};
+		buffer.p[i] = {re, im};
 	}
 	
 	//AudioOutput::fill_audio_buffer(preview_audio_buffer, true);
 }
 
 void AudioTXProcessor::on_message(const Message* const msg) {
-	const auto message = static_cast<const AudioTXConfigMessage*>(msg);
+	const auto message = *reinterpret_cast<const AudioTXConfigMessage*>(msg);
 	
 	switch(msg->id) {
 		case Message::ID::AudioTXConfig:
-
-			// 1<<18 = 262144
-			// m = (262144 * a) / 1536000
-			// a = 262144 / 1536000 (*1000 = 171)
-			bw = 171 * (message->bw);
-			divider = message->divider;
-			ctcss_phase_inc = message->ctcss_phase_inc;
-			ctcss_enabled = message->ctcss_enabled;
+			fm_delta = message.fm_delta * (0xFFFFFFULL / 1536000);
+			divider = message.divider;
+			ctcss_enabled = message.ctcss_enabled;
+			ctcss_phase_inc = message.ctcss_phase_inc;
 			as = 0;
 
 			configured = true;

firmware/baseband/proc_audiotx.hpp

@@ -38,19 +38,21 @@ private:
 	
 	BasebandThread baseband_thread { 1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
 	
-	int8_t audio_fifo_data[2048];
+	int8_t audio_fifo_data[2048] { };
 	FIFO<int8_t> audio_fifo = { audio_fifo_data, 11 };	// 43ms @ 48000Hz
 	
-	uint32_t bw;
-	uint32_t divider;
-	uint8_t as = 0;
-	uint32_t ctcss_phase_inc;
-	bool ctcss_enabled;
+	uint32_t fm_delta { 0 };
+	uint32_t divider { };
+	uint32_t as { 0 };
+	bool ctcss_enabled { false };
+	uint32_t ctcss_phase_inc { };
+	uint32_t ctcss_phase { 0 }, phase { 0 }, sphase { 0 };
+	int8_t out_sample { };
+	int32_t ctcss_sample { 0 }, sample { 0 }, sample_mixed { }, delta { };
 	
-	int8_t re, im;
-	int8_t ctcss_sample, sample;
+	int8_t re { 0 }, im { 0 };
 	
-	bool asked = false;
+	bool asked { false };
 
 	//int16_t audio_data[64];
 	/*const buffer_s16_t preview_audio_buffer {
@@ -58,10 +60,7 @@ private:
 		sizeof(int16_t)*64
 	};*/
 	
-	FIFOSignalMessage sigmessage;
-	
-	uint32_t ctcss_phase, phase, sphase;
-	int32_t frq;
+	FIFOSignalMessage sigmessage { };
 };
 
 #endif

firmware/baseband/proc_jammer.cpp

@@ -36,7 +36,7 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
 			// Find next enabled range
 			do {
 				current_range++;
-				if (current_range == 9) current_range = 0;
+				if (current_range == 24) current_range = 0;				// Warning ! Should match JAMMER_MAX_CH
 			} while (!jammer_channels[current_range].enabled);
 			
 			jammer_duration = jammer_channels[current_range].duration;

firmware/baseband/proc_jammer.hpp

@@ -36,7 +36,7 @@ public:
 private:
 	bool configured = false;
 	
-	BasebandThread baseband_thread { 1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
+	BasebandThread baseband_thread { 3072000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
 	
 	JammerChannel * jammer_channels {  };