0
1
mirror of https://github.com/radio95-rnt/fm95.git synced 2026-02-27 11:33:54 +01:00
This commit is contained in:
2025-04-19 13:04:07 +02:00
parent 702ee8922b
commit 4564bbf737
8 changed files with 107 additions and 45 deletions

View File

@@ -133,41 +133,41 @@ void calculate_dcf77_bits(time_t now, int *bits) {
bits[20] = 1;
int minutes = t->tm_min;
for (int i = 0; i < 4; i++) {
bits[21 + i] = (minutes % 10 >> i) & 1;
}
for (int i = 0; i < 3; i++) {
bits[25 + i] = (minutes / 10 >> i) & 1;
}
for (int i = 0; i < 4; i++) {
bits[21 + i] = (minutes % 10 >> i) & 1;
}
for (int i = 0; i < 3; i++) {
bits[25 + i] = (minutes / 10 >> i) & 1;
}
int minute_parity = 0;
for (int i = 21; i <= 27; i++) {
minute_parity ^= bits[i];
}
bits[28] = minute_parity;
int minute_parity = 0;
for (int i = 21; i <= 27; i++) {
minute_parity ^= bits[i];
}
bits[28] = minute_parity;
int hours = t->tm_hour;
if(cest) hours += 1;
for (int i = 0; i < 4; i++) {
bits[29 + i] = (hours % 10 >> i) & 1;
}
for (int i = 0; i < 2; i++) {
bits[33 + i] = (hours / 10 >> i) & 1;
}
bits[29 + i] = (hours % 10 >> i) & 1;
}
for (int i = 0; i < 2; i++) {
bits[33 + i] = (hours / 10 >> i) & 1;
}
int hour_parity = 0;
for (int i = 29; i <= 34; i++) {
hour_parity ^= bits[i];
}
bits[35] = hour_parity;
for (int i = 29; i <= 34; i++) {
hour_parity ^= bits[i];
}
bits[35] = hour_parity;
int day = t->tm_mday;
for (int i = 0; i < 4; i++) {
bits[36 + i] = (day % 10 >> i) & 1;
}
for (int i = 0; i < 2; i++) {
bits[40 + i] = (day / 10 >> i) & 1;
}
bits[36 + i] = (day % 10 >> i) & 1;
}
for (int i = 0; i < 2; i++) {
bits[40 + i] = (day / 10 >> i) & 1;
}
int dow = t->tm_wday == 0 ? 7 : t->tm_wday;
bits[42] = dow & 0x01;
@@ -176,17 +176,17 @@ void calculate_dcf77_bits(time_t now, int *bits) {
int month = t->tm_mon + 1;
for (int i = 0; i < 4; i++) {
bits[45 + i] = (month % 10 >> i) & 1;
}
bits[45 + i] = (month % 10 >> i) & 1;
}
bits[49] = (month / 10) & 0x01;
int year = t->tm_year % 100;
for (int i = 0; i < 4; i++) {
bits[50 + i] = (year % 10 >> i) & 1;
bits[50 + i] = (year % 10 >> i) & 1;
}
for (int i = 0; i < 4; i++) {
bits[54 + i] = (year / 10 >> i) & 1;
}
bits[54 + i] = (year / 10 >> i) & 1;
}
int year_parity = 0;
for (int i = 36; i <= 57; i++) {

View File

@@ -21,6 +21,7 @@
#include "../lib/fm_modulator.h"
#include "../lib/optimization.h"
#include "../lib/bs412.h"
#include "../lib/gain_control.h"
#define DEFAULT_SAMPLE_RATE 192000
@@ -453,6 +454,10 @@ int main(int argc, char **argv) {
MPXPowerMeasurement mpx_only_power;
init_modulation_power_measure(&mpx_only_power, sample_rate);
AGC agc;
void initAGC(AGC* agc, int sampleRate, float targetLevel, float minGain, float maxGain, float attackTime, float releaseTime);
initAGC(&agc, sample_rate, 0.707f, 0.25f, 2.5f, 0.01f, 0.4f);
signal(SIGINT, stop);
signal(SIGTERM, stop);
@@ -512,6 +517,7 @@ int main(int argc, char **argv) {
float ready_l = apply_preemphasis(&preemp_l, l_in);
float ready_r = apply_preemphasis(&preemp_r, r_in);
ready_l = process_agc_stereo(&agc, ready_l, ready_r, &ready_r);
ready_l = hard_clip(ready_l*audio_volume, clipper_threshold);
ready_r = hard_clip(ready_r*audio_volume, clipper_threshold);