diff --git a/build/Makefile b/build/Makefile
index d865ff4..b940a77 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -24,16 +24,25 @@ endif
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
 endif
 
-EXEC=broadcast_fm
+EXEC=broadcast_fm rf_jammer
 
 all: $(EXEC)
 
-broadcast_fm:  broadcast_fm.o wave.o modulator.o FIR_Audio_Filter_Filter.o FM_Baseband_Filter.o AudioPreemphasis_Filter.o hxcmod.o rand_gen.o
+broadcast_fm:  broadcast_fm.o rds.o wave.o modulator.o FIR_Audio_Filter_Filter.o FM_Baseband_Filter.o AudioPreemphasis_Filter.o hxcmod.o rand_gen.o
+	$(CC) -o $@    $^ $(LDFLAGS)
+
+rf_jammer:  rf_jammer.o wave.o modulator.o rand_gen.o
 	$(CC) -o $@    $^ $(LDFLAGS)
 
 broadcast_fm.o: ../src/broadcast_fm/broadcast_fm.c
 	$(CC) -o $@ -c $< $(CFLAGS)
 
+rf_jammer.o: ../src/rf_jammer/rf_jammer.c
+	$(CC) -o $@ -c $< $(CFLAGS)
+
+rds.o: ../src/broadcast_fm/rds.c
+	$(CC) -o $@ -c $< $(CFLAGS)
+
 utils.o: ../src/common/utils.c
 	$(CC) -o $@ -c $< $(CFLAGS)
 
diff --git a/src/rf_jammer/rf_jammer.c b/src/rf_jammer/rf_jammer.c
new file mode 100644
index 0000000..0c19fd2
--- /dev/null
+++ b/src/rf_jammer/rf_jammer.c
@@ -0,0 +1,415 @@
+///////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------//
+//-------------------------------------------------------------------------------//
+//-----------H----H--X----X-----CCCCC----22222----0000-----0000------11----------//
+//----------H----H----X-X-----C--------------2---0----0---0----0--1--1-----------//
+//---------HHHHHH-----X------C----------22222---0----0---0----0-----1------------//
+//--------H----H----X--X----C----------2-------0----0---0----0-----1-------------//
+//-------H----H---X-----X---CCCCC-----222222----0000-----0000----1111------------//
+//-------------------------------------------------------------------------------//
+//----------------------------------------------------- http://hxc2001.free.fr --//
+///////////////////////////////////////////////////////////////////////////////////
+// File : rf_jammer.c
+// Contains: rf jammer tool
+//
+// This file is part of rf-tools.
+//
+// Written by: Jean-François DEL NERO
+//
+// Copyright (C) 2022 Jean-François DEL NERO
+//
+// You are free to do what you want with this code.
+// A credit is always appreciated if you use it into your product :)
+//
+// Change History (most recent first):
+///////////////////////////////////////////////////////////////////////////////////
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <time.h>
+
+#include <stdint.h>
+
+#include "wave.h"
+
+#include "modulator.h"
+
+#include "utils.h"
+
+#include "rand_gen.h"
+
+#define printf(fmt...) do { \
+		if(!stdoutmode) \
+		fprintf(stdout, fmt); \
+    } while (0)
+
+#define IQ_SAMPLE_RATE           (10000000UL)
+#define SUBCARRIERS_SAMPLE_RATE  (10000000UL)
+
+#define IF_FREQ                     0
+
+int verbose;
+int stdoutmode;
+
+int isOption(int argc, char* argv[],char * paramtosearch,char * argtoparam)
+{
+	int param=1;
+	int i,j;
+
+	char option[512];
+
+	memset(option,0,512);
+	while(param<=argc)
+	{
+		if(argv[param])
+		{
+			if(argv[param][0]=='-')
+			{
+				memset(option,0,512);
+
+				j=0;
+				i=1;
+				while( argv[param][i] && argv[param][i]!=':')
+				{
+					option[j]=argv[param][i];
+					i++;
+					j++;
+				}
+
+				if( !strcmp(option,paramtosearch) )
+				{
+					if(argtoparam)
+					{
+						if(argv[param][i]==':')
+						{
+							i++;
+							j=0;
+							while( argv[param][i] )
+							{
+								argtoparam[j]=argv[param][i];
+								i++;
+								j++;
+							}
+							argtoparam[j]=0;
+							return 1;
+						}
+						else
+						{
+							return -1;
+						}
+					}
+					else
+					{
+						return 1;
+					}
+				}
+			}
+		}
+		param++;
+	}
+
+	return 0;
+}
+
+void printhelp(char* argv[])
+{
+	printf("Options:\n");
+	printf("  -stdout\t\t\t: IQ stream send to stdout\n");
+	printf("  -freq_bw:[Hz] \t\t: bandwith (Hz)\n");
+	printf("  -ping_pong_freq:[centi Hz]\t: ping pong freq (per step of 0.01 Hz)\n");
+	printf("  -jam_mode:[Mode id]\t\t: Mode. 0=ping pong, 1=random, 3=full iq random\n");
+	printf("  -jam_interval:[ms]\t\t: Interval (ms)\n");
+	printf("  -jam_duration:[ms]\t\t: pulses duration (ms)\n");
+	printf("  -rand_interval\t\t: random interval mode\n");
+	printf("  -rand_duration\t\t: random duration mode\n");
+	printf("  -generate\t\t\t: Generate the IQ stream\n");
+	printf("  -help\t\t\t\t: This help\n");
+	printf("\n");
+}
+
+#define BUFFER_SAMPLES_SIZE (2048*8)
+#define PI 3.1415926535897932384626433832795
+
+int main(int argc, char* argv[])
+{
+	char temp_str[512];
+
+	wave_io * wave1,*wave2;
+	uint16_t iq_wavebuf[ BUFFER_SAMPLES_SIZE * (IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE)];
+
+	int16_t wavebuf_dbg[BUFFER_SAMPLES_SIZE];
+	double  wavebuf_dbg2[BUFFER_SAMPLES_SIZE];
+
+	unsigned int i,j,k;
+	int freq_bw;
+	int ping_pong_freq;
+	int jam_mode;
+
+	int pulses_interval, pulses_interval_cnt;
+	int pulses_duration, pulses_duration_cnt;
+	int rand_interval,rand_duration;
+
+	double audio_sample_final;
+	double fm_mod;
+
+	double old_freq,interpolation_step;
+
+	uint32_t randdword;
+
+	rand_gen_state randgen;
+
+	iq_wave_gen iqgen;
+
+	wave_gen audio_l_gen;
+
+	verbose=0;
+	stdoutmode = 0;
+	jam_mode = 0;
+	freq_bw = 200000;
+
+	ping_pong_freq = 1000; // 10.00 Hz
+
+	pulses_duration_cnt = 0;
+	pulses_interval_cnt = 0;
+	rand_interval = 0;
+	rand_duration = 0;
+
+	if(isOption(argc,argv,"stdout",NULL)>0)
+	{
+		stdoutmode = 1;
+	}
+
+	if(!stdoutmode)
+	{
+		printf("rf_jammer v0.0.0.1\n");
+		printf("Copyright (C) 2022 Jean-Francois DEL NERO\n");
+		printf("This program comes with ABSOLUTELY NO WARRANTY\n");
+		printf("This is free software, and you are welcome to redistribute it\n");
+		printf("under certain conditions;\n\n");
+	}
+
+	// Verbose option...
+	if(isOption(argc,argv,"verbose",0)>0)
+	{
+		printf("verbose mode\n");
+		verbose=1;
+	}
+
+	// help option...
+	if(isOption(argc,argv,"help",0)>0)
+	{
+		printhelp(argv);
+	}
+
+	pulses_interval = 0;
+	pulses_duration = 2000000;
+
+	if(isOption(argc,argv,"freq_bw",(char*)&temp_str)>0)
+	{
+		freq_bw = atoi(temp_str);
+	}
+
+	if(isOption(argc,argv,"ping_pong_freq",(char*)&temp_str)>0)
+	{
+		ping_pong_freq = atoi(temp_str);
+	}
+
+	if(isOption(argc,argv,"jam_mode",(char*)&temp_str)>0)
+	{
+		jam_mode = atoi(temp_str) ;
+	}
+
+	if(isOption(argc,argv,"jam_interval",(char*)&temp_str)>0)
+	{
+		pulses_interval = atoi(temp_str)  * (IQ_SAMPLE_RATE / 1000);
+	}
+
+	if(isOption(argc,argv,"jam_duration",(char*)&temp_str)>0)
+	{
+		pulses_duration = atoi(temp_str)  * (IQ_SAMPLE_RATE / 1000);
+	}
+
+	if(isOption(argc,argv,"rand_interval",NULL)>0)
+	{
+		rand_interval = 1;
+	}
+
+	if(isOption(argc,argv,"rand_duration",NULL)>0)
+	{
+		rand_duration = 1;
+	}
+
+	if(isOption(argc,argv,"generate",0)>0)
+	{
+		rand_gen_init(&randgen, 0xC279DCEF );
+
+		// Init oscillators
+
+		// Left and Right audio freq (used if no .mod music file)
+		audio_l_gen.phase = 0;
+		audio_l_gen.Frequency = ((double)ping_pong_freq) / 100.0;
+		audio_l_gen.Amplitude = 100;
+		audio_l_gen.sample_rate = SUBCARRIERS_SAMPLE_RATE;
+s
+		// IQ Modulator
+		iqgen.phase = 0;
+		iqgen.Frequency = IF_FREQ;
+		iqgen.Amplitude = 127;
+		iqgen.sample_rate = IQ_SAMPLE_RATE;
+
+		if(stdoutmode)
+		{
+			// stdout / stream mode : IQ are outputed to the stdout -> use a pipe to hackrf_transfer
+			wave1 = create_wave(NULL,iqgen.sample_rate,WAVE_FILE_FORMAT_RAW_8BITS_IQ);
+			wave2 = NULL;
+		}
+		else
+		{
+			// file mode : create iq + wav files
+			wave1 = create_wave("test.iq",iqgen.sample_rate,WAVE_FILE_FORMAT_RAW_8BITS_IQ);
+			wave2 = create_wave("test.wav",SUBCARRIERS_SAMPLE_RATE,WAVE_FILE_FORMAT_WAV_16BITS_MONO);
+		}
+
+		if(wave1)
+		{
+			old_freq = IF_FREQ;
+
+			// Main loop...
+			for(i=0;(i<8) || stdoutmode ;i++)
+			{
+				switch( jam_mode )
+				{
+					case 0: // freq ping pong
+						for(j=0;j<BUFFER_SAMPLES_SIZE;j++)
+						{
+							audio_sample_final = f_get_next_sample(&audio_l_gen);
+
+							fm_mod = ((audio_sample_final / (double)(100.0)) * (double)(freq_bw));
+							wavebuf_dbg[j] = fm_mod;
+							wavebuf_dbg2[j] = fm_mod;
+						}
+					break;
+					case 1: // rand frequency
+						for(j=0;j<BUFFER_SAMPLES_SIZE;j++)
+						{
+							randdword = rand_gen_get_next_word(&randgen);
+
+							fm_mod = (((double)(randdword & 0x7FFFFFFF) / (double)(0x7FFFFFFF)) * (double)(freq_bw));
+
+							if(randdword & 0x80000000)
+								fm_mod = -fm_mod;
+
+							wavebuf_dbg[j] = fm_mod;
+							wavebuf_dbg2[j] = fm_mod;
+						}
+					break;
+
+					default:
+					break;
+				}
+
+				if(jam_mode != 3)
+				{
+					// Sub carriers sample rate to carrier IQ rate modulation + resampling
+					for(j=0;j<BUFFER_SAMPLES_SIZE;j++)
+					{
+						// linear interpolation TODO ?: Cubic interpolation
+						interpolation_step = (wavebuf_dbg2[j] - old_freq) / (double)(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE);
+
+						for(k=0;k<(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE);k++)
+						{
+							old_freq += interpolation_step;
+
+							iqgen.Frequency = ((double)IF_FREQ + old_freq);
+
+							if( pulses_interval_cnt < pulses_interval )
+							{
+								pulses_interval_cnt++;
+								iq_wavebuf[(j*(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE))+k] = 0x0000;
+							}
+							else
+							{
+								iq_wavebuf[(j*(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE))+k] = get_next_iq(&iqgen);//iq_sample;
+
+								if(pulses_duration_cnt < pulses_duration)
+								{
+									pulses_duration_cnt++;
+								}
+								else
+								{
+									pulses_duration_cnt = 0;
+									pulses_interval_cnt = 0;
+
+									if(rand_interval)
+										pulses_interval = (rand_gen_get_next_word(&randgen) & 0x7F) * (IQ_SAMPLE_RATE / 1000);
+
+									if(rand_duration)
+										pulses_duration = (rand_gen_get_next_word(&randgen) & 0x7F) * (IQ_SAMPLE_RATE / 1000);
+								}
+							}
+
+							iq_wavebuf[(j*(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE))+k] = get_next_iq(&iqgen);//iq_sample;
+						}
+
+						old_freq = wavebuf_dbg2[j];
+					}
+				}
+				else
+				{
+					for(j=0;j<BUFFER_SAMPLES_SIZE * (IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE);j++)
+					{
+						randdword = rand_gen_get_next_word(&randgen);
+
+						if( pulses_interval_cnt < pulses_interval )
+						{
+							pulses_interval_cnt++;
+							iq_wavebuf[j] = 0x0000;
+						}
+						else
+						{
+							iq_wavebuf[j] = (randdword ^ (randdword>>16));
+
+							if(pulses_duration_cnt < pulses_duration)
+							{
+								pulses_duration_cnt++;
+							}
+							else
+							{
+								pulses_duration_cnt = 0;
+								pulses_interval_cnt = 0;
+
+								if(rand_interval)
+									pulses_interval = (rand_gen_get_next_word(&randgen) & 0x7F) * (IQ_SAMPLE_RATE / 1000);
+
+								if(rand_duration)
+									pulses_duration = (rand_gen_get_next_word(&randgen) & 0x7F) * (IQ_SAMPLE_RATE / 1000);
+
+							}
+						}
+					}
+				}
+
+				write_wave(wave1, &iq_wavebuf,BUFFER_SAMPLES_SIZE*(IQ_SAMPLE_RATE/SUBCARRIERS_SAMPLE_RATE));
+				write_wave(wave2, &wavebuf_dbg,BUFFER_SAMPLES_SIZE);
+			}
+			close_wave(wave1);
+			close_wave(wave2);
+		}
+	}
+
+
+	if( (isOption(argc,argv,"help",0)<=0) &&
+		(isOption(argc,argv,"generate",0)<=0)
+		)
+	{
+		printhelp(argv);
+	}
+
+	return 0;
+}