add doc, remove di, add symbol_shifting

src/ascii_cmd.c

@@ -118,8 +118,8 @@ static void handle_ct(char *arg, RDSModulator* mod, char* output) {
 	strcpy(output, "+\0");
 }
 
-static void handle_di(char *arg, RDSModulator* mod, char* output) {
-	mod->enc->data[mod->enc->program].di = atoi(arg);
+static void handle_dpty(char *arg, RDSModulator* mod, char* output) {
+	mod->enc->data[mod->enc->program].dpty = atoi(arg);
 	strcpy(output, "+\0");
 }
 
@@ -504,7 +504,6 @@ static const command_handler_t commands_eq3[] = {
 	{"PI", handle_pi, 2},
 	{"TP", handle_tp, 2},
 	{"TA", handle_ta, 2},
-	{"DI", handle_di, 2},
 	{"CT", handle_ct, 2},
 	{"AF", handle_af, 2}
 };
@@ -525,6 +524,7 @@ static const command_handler_t commands_eq5[] = {
 	{"AFCH", handle_afch, 4},
 	{"UDG1", handle_udg1, 4},
 	{"UDG2", handle_udg2, 4},
+	{"DPTY", handle_dpty, 4},
 };
 
 static const command_handler_t commands_eq2[] = {

src/modulator.c

@@ -66,6 +66,8 @@ void init_rds_modulator(RDSModulator* rdsMod, RDSEncoder* enc) {
 
 	rdsMod->enc = enc;
 
+	if(STREAMS > 0) rdsMod->data[1].symbol_shifting.symbol_shift = SAMPLES_PER_BIT / 2;
+
 	for (uint8_t i = 0; i < 2; i++) {
 		for (uint16_t j = 0; j < FILTER_SIZE; j++) {
 			waveform[i][j] = i ?
@@ -109,7 +111,15 @@ float get_rds_sample(RDSModulator* rdsMod, uint8_t stream) {
 	}
 	rdsMod->data[stream].sample_count++;
 
-	sample = rdsMod->data[stream].sample_buffer[rdsMod->data[stream].out_sample_index];
+	if(rdsMod->data[stream].symbol_shifting.symbol_shift != 0) {
+		rdsMod->data[stream].symbol_shifting.sample_buffer[rdsMod->data[stream].symbol_shifting.sample_buffer_idx++] = rdsMod->data[stream].sample_buffer[rdsMod->data[stream].out_sample_index];
+
+		if (rdsMod->data[stream].symbol_shifting.sample_buffer_idx == rdsMod->data[stream].symbol_shifting.symbol_shift) rdsMod->data[stream].symbol_shifting.sample_buffer_idx = 0;
+
+		sample = rdsMod->data[stream].symbol_shifting.sample_buffer[rdsMod->data[stream].symbol_shifting.sample_buffer_idx];
+	} else {
+		sample = rdsMod->data[stream].sample_buffer[rdsMod->data[stream].out_sample_index];
+	}
 
 	rdsMod->data[stream].sample_buffer[rdsMod->data[stream].out_sample_index++] = 0;
 	if (rdsMod->data[stream].out_sample_index == SAMPLE_BUFFER_SIZE)

src/modulator.h

@@ -11,6 +11,13 @@ typedef struct
 	uint8_t rdsgen : 2;
 } RDSModulatorParameters;
 
+typedef struct
+{
+	uint8_t symbol_shift: 7;
+	float sample_buffer[SAMPLE_BUFFER_SIZE];
+	uint8_t sample_buffer_idx : 7;
+} RDSModulatorSymbolShifting;
+
 typedef struct
 {
 	uint8_t bit_buffer[BITS_PER_GROUP];
@@ -22,6 +29,7 @@ typedef struct
 	uint8_t sample_count;
 	uint16_t in_sample_index;
 	uint16_t out_sample_index;
+	RDSModulatorSymbolShifting symbol_shifting;
 } RDSModulatorModulationData;
 
 typedef struct {

src/rds.c

@@ -28,8 +28,8 @@ void saveToFile(RDSEncoder *emp, const char *option) {
 		tempEncoder.data[emp->program].tp = emp->data[emp->program].tp;
 	} else if (strcmp(option, "TA") == 0) {
 		tempEncoder.data[emp->program].ta = emp->data[emp->program].ta;
-	} else if (strcmp(option, "DI") == 0) {
-		tempEncoder.data[emp->program].di = emp->data[emp->program].di;
+	} else if (strcmp(option, "DPTY") == 0) {
+		tempEncoder.data[emp->program].dpty = emp->data[emp->program].dpty;
 	} else if (strcmp(option, "CT") == 0) {
 		tempEncoder.data[emp->program].ct = emp->data[emp->program].ct;
 	} else if (strcmp(option, "RT1") == 0 || strcmp(option, "TEXT") == 0) {
@@ -201,8 +201,7 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
 	}
 
 	blocks[1] |= enc->data[enc->program].ta << 4;
-	blocks[1] |= 1 << 3; // MS was removed from the standard, this is to keep compatibility with old receivers
-	blocks[1] |= ((enc->data[enc->program].di >> (3 - enc->state[enc->program].ps_csegment)) & 1) << 2;
+	if(enc->state[enc->program].ps_csegment == 0) blocks[1] |= enc->data[enc->program].dpty << 2;
 	blocks[1] |= enc->state[enc->program].ps_csegment;
 	blocks[2] = get_next_af(enc);
 	if(enc->data[enc->program].ta && enc->state[enc->program].tps_text[0] != '\0') {
@@ -712,7 +711,6 @@ void set_rds_defaults(RDSEncoder* enc, uint8_t program) {
 	enc->encoder_data.encoder_addr[1] = 255;
 
 	enc->data[program].ct = 1;
-	enc->data[program].di = 1;
 	strcpy((char *)enc->data[program].grp_sqc, DEFAULT_GRPSQC);
 	enc->data[program].tp = 1;
 	enc->data[program].pi = 0xFFFF;

src/rds.h

@@ -76,7 +76,7 @@ typedef struct {
 	uint8_t ta : 1;
 	uint8_t pty : 5;
 	uint8_t tp : 1;
-	uint8_t di : 4;
+	uint8_t dpty : 1;
 
 	char tps[PS_LENGTH];