From a0db0d7d9b8a394fdbe9ba0f186bcf166521095c Mon Sep 17 00:00:00 2001 From: Prasad Anjangi Date: Fri, 23 Apr 2021 14:47:52 +0800 Subject: [PATCH] minor doc updated and cleanup --- unetsocket/c/Makefile | 4 +--- unetsocket/c/samples/bbrecord.c | 6 +++--- unetsocket/c/samples/pbrecord.c | 2 +- unetsocket/c/unet_ext.c | 35 +++++++++++++++++++-------------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/unetsocket/c/Makefile b/unetsocket/c/Makefile index 1ea5784..91c68f9 100644 --- a/unetsocket/c/Makefile +++ b/unetsocket/c/Makefile @@ -2,11 +2,9 @@ CC = gcc CFLAGS += -std=c99 -Wall -Wextra -Werror -Wfloat-equal -Wconversion -Wparentheses -pedantic -Wunused-parameter -Wunused-variable -Wreturn-type -Wno-unused-function -Wredundant-decls -Wreturn-type -Wunused-value -Wswitch-default -Wuninitialized -Winit-self -O2 FJAGE_VER=7275142c2bc846d2f07400d7d628f213cb5b56ab FJAGE_DIR=fjage-$(FJAGE_VER) - -CONTRIB_VER = bd95ed77ef7c90edbba04dd67f8fb235262e08c8 BUILD = build BUILD_API = $(BUILD)/api -CONTRIB_DIR = $(BUILD)/unet-contrib-$(CONTRIB_VER) +CONTRIB_DIR = $(BUILD)/temp all: libs rm -rf *.zip diff --git a/unetsocket/c/samples/bbrecord.c b/unetsocket/c/samples/bbrecord.c index b7950a7..31f69a4 100644 --- a/unetsocket/c/samples/bbrecord.c +++ b/unetsocket/c/samples/bbrecord.c @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { if (argc > 3) port = (int)strtol(argv[3], NULL, 10); } - float buf[siglen]; + float buf[2*siglen]; #ifndef _WIN32 // Check valid ip address @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) { printf("Starting a record\n"); rv = unetsocket_bbrecord(sock, buf, siglen); if (rv == 0) { - for(int i = 0; i < siglen; i++) { + for(int i = 0; i < 2*siglen; i++) { fprintf(fptr,"%f\n", buf[i]); } } else { @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) { // Close the unet socket unetsocket_close(sock); - printf("\nRecording Complete\n"); + printf("\nRecording Complete (samples/bbrecordedsignal.txt saved with alternating real and imaginary values)\n"); fclose(fptr); return 0; diff --git a/unetsocket/c/samples/pbrecord.c b/unetsocket/c/samples/pbrecord.c index f319c51..dbdd8fe 100644 --- a/unetsocket/c/samples/pbrecord.c +++ b/unetsocket/c/samples/pbrecord.c @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) { // Close the unet socket unetsocket_close(sock); - printf("\nRecording Complete\n"); + printf("\nRecording Complete (samples/pbrecordedsignal.txt saved) \n"); fclose(fptr); return 0; diff --git a/unetsocket/c/unet_ext.c b/unetsocket/c/unet_ext.c index 6533cd4..ff0cfa8 100644 --- a/unetsocket/c/unet_ext.c +++ b/unetsocket/c/unet_ext.c @@ -156,7 +156,7 @@ int unetsocket_npulses(unetsocket_t sock, float *signal, int nsamples, int rate, fjage_aid_t bb; int pulsedelay_cache = 0; int npulses_cache = 0; - float signalduration = (float)((1000 / rate) * nsamples); + float signalduration = (float)((1000.0 / rate) * nsamples); int pulsedelay = (int)round(((float)pri - signalduration)); if (pri < signalduration + 5) { @@ -174,7 +174,7 @@ int unetsocket_npulses(unetsocket_t sock, float *signal, int nsamples, int rate, error("Unable to get/set pulse delay..."); return -1; } - bb = fjage_agent_for_service(usock->gw, "org.arl.unet.Services.BASEBAND"); + bb = fjage_agent_for_service(usock->gw, "org.arl.unet.Services.PHYSICAL"); msg = fjage_msg_create("org.arl.unet.bb.TxBasebandSignalReq", FJAGE_REQUEST); fjage_msg_set_recipient(msg, bb); fjage_msg_add_float(msg, "fc", 0); @@ -429,7 +429,7 @@ int unetsocket_tx_signal(unetsocket_t sock, float *signal, int nsamples, float f _unetsocket_t *usock = sock; fjage_msg_t msg; fjage_aid_t bb; - bb = fjage_agent_for_service(usock->gw, "org.arl.unet.Services.BASEBAND"); + bb = fjage_agent_for_service(usock->gw, "org.arl.unet.Services.PHYSICAL"); msg = fjage_msg_create("org.arl.unet.bb.TxBasebandSignalReq", FJAGE_REQUEST); fjage_msg_set_recipient(msg, bb); if ((int)fc == 0) fjage_msg_add_float(msg, "fc", fc); @@ -449,19 +449,24 @@ int unetsocket_bbrecord(unetsocket_t sock, float *buf, int nsamples) { if (sock == NULL) return -1; if (nsamples <= 0 || buf == NULL) return -1; _unetsocket_t *usock = sock; - int bbscnt = 0; - float tempbuf[PBSBLK]; - bbscnt = (int)ceil((float)nsamples / PBSBLK); - if (unetsocket_iset(usock, 0, "org.arl.unet.Services.PHYSICAL", "bbscnt", bbscnt) < 0) return -1; - for (int i = 0; i < bbscnt; i++) - { - fjage_msg_t rxsigntf = receive(usock, "org.arl.unet.bb.RxBasebandSignalNtf", NULL, 5 * TIMEOUT); - fjage_msg_get_float_array(rxsigntf, "signal", tempbuf, PBSBLK); - fjage_msg_destroy(rxsigntf); - unsigned long remaining = (unsigned long) (nsamples - (i * PBSBLK)); - memcpy(buf + (i * PBSBLK), tempbuf, remaining > PBSBLK ? (sizeof(float)*PBSBLK) : (sizeof(float)*remaining)); + fjage_msg_t msg; + fjage_aid_t bb; + msg = fjage_msg_create("org.arl.unet.bb.RecordBasebandSignalReq", FJAGE_REQUEST); + bb = fjage_agent_for_service(usock->gw, "org.arl.unet.Services.PHYSICAL"); + fjage_msg_set_recipient(msg, bb); + fjage_msg_add_int(msg, "recLength", nsamples); + msg = request(usock, msg, 5 * TIMEOUT); + if (msg != NULL && fjage_msg_get_performative(msg) == FJAGE_AGREE) { + fjage_msg_destroy(msg); + msg = receive(usock, "org.arl.unet.bb.RxBasebandSignalNtf", NULL, 20 * TIMEOUT); + if (msg != NULL) { + fjage_msg_get_float_array(msg, "signal", buf, 2 * nsamples); + fjage_msg_destroy(msg); + return 0; + } } - return 0; + fjage_msg_destroy(msg); + return -1; } int unetsocket_rs232_wakeup(char *devname, int baud, const char *settings)