tx: lowest documented PA table, test_burst, tx payload logging; 200ms delay improves SDR repeat decode 3%->30%
This commit is contained in:
+71
-15
@@ -33,7 +33,9 @@ static volatile int64_t s_irq_ts;
|
||||
static volatile bool s_want_radio_reset;
|
||||
static volatile bool s_want_test_tx;
|
||||
static volatile bool s_want_probe;
|
||||
static volatile bool s_want_test_burst;
|
||||
static uint8_t s_test_access_nr;
|
||||
static uint8_t s_test_lfield = 19;
|
||||
static uint32_t s_seq;
|
||||
|
||||
static struct { uint32_t hash; int64_t ts; } s_dup[DUP_RING];
|
||||
@@ -224,24 +226,33 @@ static const char *do_tx(const uint8_t *payload, int payload_len,
|
||||
}
|
||||
|
||||
static void log_tx(const char *result, uint32_t hash, int len,
|
||||
int64_t rx_ts, int64_t tx_start, int64_t tx_done)
|
||||
int64_t rx_ts, int64_t tx_start, int64_t tx_done,
|
||||
const uint8_t *payload, int payload_len)
|
||||
{
|
||||
LOGJ("\"event\":\"wmbus_tx\",\"timestamp_us\":%lld,"
|
||||
"\"source_rx_timestamp_us\":%lld,\"delay_us\":%lld,"
|
||||
"\"length\":%d,\"hash\":\"%08" PRIx32 "\","
|
||||
"\"configured_tx_dbm\":%d,\"airtime_us\":%lld,\"result\":\"%s\"",
|
||||
(long long)tx_start, (long long)rx_ts,
|
||||
(long long)(tx_start - rx_ts), len, hash,
|
||||
(int)g_cfg.tx_power_dbm,
|
||||
(long long)(tx_done > tx_start ? tx_done - tx_start : 0), result);
|
||||
printf("{\"seq\":%" PRIu32 ",\"event\":\"wmbus_tx\",\"timestamp_us\":%lld,"
|
||||
"\"source_rx_timestamp_us\":%lld,\"delay_us\":%lld,"
|
||||
"\"length\":%d,\"hash\":\"%08" PRIx32 "\","
|
||||
"\"configured_tx_dbm\":%d,\"airtime_us\":%lld,\"result\":\"%s\"",
|
||||
s_seq++, (long long)tx_start, (long long)rx_ts,
|
||||
(long long)(tx_start - rx_ts), len, hash,
|
||||
(int)g_cfg.tx_power_dbm,
|
||||
(long long)(tx_done > tx_start ? tx_done - tx_start : 0), result);
|
||||
if (payload && payload_len > 0) {
|
||||
printf(",\"tx_payload\":\"");
|
||||
print_hex(payload, payload_len);
|
||||
printf("\"");
|
||||
}
|
||||
printf("}\n");
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
static void run_test_tx(void)
|
||||
{
|
||||
uint8_t frame[64];
|
||||
int n = wmbus_build_test_frame(frame, sizeof(frame) - 2, s_test_access_nr++);
|
||||
uint8_t frame[256];
|
||||
int n = wmbus_build_test_frame(frame, sizeof(frame), s_test_access_nr++,
|
||||
s_test_lfield);
|
||||
if (n < 0) return;
|
||||
uint8_t payload[66];
|
||||
static uint8_t payload[258];
|
||||
payload[0] = WMBUS_MODE_BYTE_A_HI;
|
||||
payload[1] = WMBUS_MODE_BYTE_A_LO;
|
||||
memcpy(payload + 2, frame, n);
|
||||
@@ -249,8 +260,9 @@ static void run_test_tx(void)
|
||||
|
||||
int64_t t0, t1;
|
||||
const char *res = do_tx(payload, n + 2, &t0, &t1);
|
||||
log_tx(res, hash, n, t0, t0, t1);
|
||||
printf("{\"seq\":%" PRIu32 ",\"event\":\"test_tx_frame\",\"raw\":\"", s_seq++);
|
||||
log_tx(res, hash, n, t0, t0, t1, NULL, 0);
|
||||
printf("{\"seq\":%" PRIu32 ",\"event\":\"test_tx_frame\",\"lfield\":%u,\"raw\":\"",
|
||||
s_seq++, s_test_lfield);
|
||||
print_hex(frame, n);
|
||||
printf("\"}\n");
|
||||
fflush(stdout);
|
||||
@@ -258,6 +270,44 @@ static void run_test_tx(void)
|
||||
sx126x_restore_rx_payload_len();
|
||||
if (!sx126x_set_rx()) recover_ladder("test_tx_rx_restore");
|
||||
}
|
||||
|
||||
// Transmit the SAME frame twice, separated by repeat_delay_ms. This
|
||||
// reproduces the original+repeat timing pattern without needing a meter,
|
||||
// isolating "can the observer decode a second identical frame N ms later"
|
||||
// from anything in the RX path.
|
||||
static void run_test_burst(void)
|
||||
{
|
||||
uint8_t frame[256];
|
||||
int n = wmbus_build_test_frame(frame, sizeof(frame), s_test_access_nr++,
|
||||
s_test_lfield);
|
||||
if (n < 0) return;
|
||||
static uint8_t payload[258];
|
||||
payload[0] = WMBUS_MODE_BYTE_A_HI;
|
||||
payload[1] = WMBUS_MODE_BYTE_A_LO;
|
||||
memcpy(payload + 2, frame, n);
|
||||
uint32_t hash = wmbus_hash(frame, n);
|
||||
|
||||
printf("{\"seq\":%" PRIu32 ",\"event\":\"test_burst_frame\",\"lfield\":%u,"
|
||||
"\"delay_ms\":%" PRIu32 ",\"raw\":\"",
|
||||
s_seq++, s_test_lfield, g_cfg.repeat_delay_ms);
|
||||
print_hex(frame, n);
|
||||
printf("\"}\n");
|
||||
fflush(stdout);
|
||||
|
||||
int64_t t0, t1;
|
||||
const char *r1 = do_tx(payload, n + 2, &t0, &t1);
|
||||
int64_t first_end = t1 > t0 ? t1 : esp_timer_get_time();
|
||||
log_tx(r1, hash, n, t0, t0, t1, NULL, 0);
|
||||
|
||||
precise_delay_until(first_end + (int64_t)g_cfg.repeat_delay_ms * 1000);
|
||||
|
||||
int64_t t2, t3;
|
||||
const char *r2 = do_tx(payload, n + 2, &t2, &t3);
|
||||
log_tx(r2, hash, n, first_end, t2, t3, NULL, 0);
|
||||
|
||||
sx126x_restore_rx_payload_len();
|
||||
if (!sx126x_set_rx()) recover_ladder("test_burst_rx_restore");
|
||||
}
|
||||
// ---------------------------------------------------------------- probe
|
||||
|
||||
static void hexdump_json(const char *key, const uint8_t *d, int n)
|
||||
@@ -394,7 +444,7 @@ static void handle_rx(int64_t rxdone_ts)
|
||||
int64_t t0, t1;
|
||||
const char *res = do_tx(txbuf, total + 2, &t0, &t1);
|
||||
remember_dup(hash, esp_timer_get_time());
|
||||
log_tx(res, hash, total, frame_end_ts, t0, t1);
|
||||
log_tx(res, hash, total, frame_end_ts, t0, t1, txbuf, total + 2);
|
||||
|
||||
// Always return to RX
|
||||
sx126x_restore_rx_payload_len();
|
||||
@@ -438,6 +488,10 @@ static void repeater_task(void *arg)
|
||||
s_want_test_tx = false;
|
||||
run_test_tx();
|
||||
}
|
||||
if (s_want_test_burst) {
|
||||
s_want_test_burst = false;
|
||||
run_test_burst();
|
||||
}
|
||||
if (s_want_probe) {
|
||||
s_want_probe = false;
|
||||
run_probe();
|
||||
@@ -477,6 +531,8 @@ void repeater_start(void)
|
||||
void repeater_request_radio_reset(void) { s_want_radio_reset = true; }
|
||||
void repeater_request_test_tx(void) { s_want_test_tx = true; }
|
||||
void repeater_request_probe(void) { s_want_probe = true; }
|
||||
void repeater_set_test_lfield(uint8_t l) { s_test_lfield = l; }
|
||||
void repeater_request_test_burst(void) { s_want_test_burst = true; }
|
||||
|
||||
// ------------------------------------------------------------------ status
|
||||
|
||||
|
||||
Reference in New Issue
Block a user