Skip to content

Commit

Permalink
fix(capi): remove the selftest and bearinf apis
Browse files Browse the repository at this point in the history
  • Loading branch information
V Prasad Anjangi authored and V Prasad Anjangi committed Oct 15, 2019
1 parent c3cfa43 commit aa31d5d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 81 deletions.
25 changes: 7 additions & 18 deletions unetsocket/c/Makefile
View file
Expand Up @@ -4,8 +4,12 @@ FJAGE_VER=edc9ecffd444adaf789d7eb2ecc650d1d7044d84
FJAGE_DIR=fjage-$(FJAGE_VER)

all: libs
rm -rf *.zip
rm -rf fjage-*

samples: libs wakeup rs232_wakeup txdata rxdata
rm -rf *.zip
rm -rf fjage-*

libs: libfjage.a libunet.a

Expand All @@ -15,9 +19,7 @@ libfjage.a: $(FJAGE_DIR)
cp $(FJAGE_DIR)/src/main/c/libfjage.a .

$(FJAGE_DIR):
# curl -LO https://github.com/org-arl/fjage/archive/v$(FJAGE_VER).zip
curl -LO https://github.com/org-arl/fjage/archive/$(FJAGE_VER).zip
# unzip -a v$(FJAGE_VER).zip
unzip -a $(FJAGE_VER).zip

libunet.a: unet.o
Expand Down Expand Up @@ -54,26 +56,13 @@ rxdata: libs rxdata.o
$(CC) -o samples/rxdata samples/rxdata.o libunet.a libfjage.a -lpthread -lm

test: libs test_unet
# ./test_unet ${IP} ${ADDR} ${DEVICE}
rm -rf *.zip
rm -rf fjage-*

deepclean: clean
rm -rf "$(FJAGE_DIR)" "$(FJAGE_VER).zip" fjage.h libfjage.a kissfft kiss_fft.h
rm -rf "$(FJAGE_DIR)" "$(FJAGE_VER).zip" fjage.h libfjage.a kissfft kiss_fft.h fjage

clean:
rm -rf c-api libunet.a *.o samples/*.o test/*.o test/test_unet samples/wakeup samples/rs232_wakeup samples/txdata samples/rxdata

api-bundle: libs
mkdir -p c-api/kissfft
mkdir -p c-api/$(FJAGE_DIR)/src/main/c
cp *.{c,h} c-api/
cp Makefile c-api/

cp kissfft/*.{c,h} c-api/kissfft
cp kissfft/Makefile c-api/kissfft/Makefile

cp $(FJAGE_DIR)/src/main/c/*.{c,h} c-api/$(FJAGE_DIR)/src/main/c/
cp $(FJAGE_DIR)/src/main/c/Makefile c-api/$(FJAGE_DIR)/src/main/c/Makefile
zip -r c-api.zip c-api/*
rm -r c-api

.PHONY: all clean
10 changes: 0 additions & 10 deletions unetsocket/c/test/test_unet.c
View file
Expand Up @@ -90,11 +90,6 @@ int main(int argc, char* argv[]) {
modem_set_tx_callback(modem, txcb);
sleep(1);

// Self test
x = modem_selftest(modem);
test_assert("Power on self test", x == 0);
sleep(3);

// Test packet transmission of different types
for (int i = 1; i <= 3 ; i++) {
x = modem_tx_data(modem, addressofDestination, data, 7, i, id);
Expand Down Expand Up @@ -138,11 +133,6 @@ int main(int argc, char* argv[]) {

// Test recording
x = modem_record(modem, buf, 1000);
// if (x == 0) {
// for(int i = 0; i < 2000; i++) {
// printf("%f\n", buf[i]);
// }
// }
test_assert("\nRecording", x == 0);

// Test setter and getter for integer valued modem parameter
Expand Down
20 changes: 0 additions & 20 deletions unetsocket/c/unet.c
View file
Expand Up @@ -274,16 +274,6 @@ int modem_get_range(modem_t modem, int to, float *range)
return -1;
}

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
int modem_get_range_and_bearing(modem_t modem, int to, float *range, float *bearing)
{
// NOTE: Currently does not return any bearing. Will be updated to support bearing
// when USBL functionality is added.
return -1;
}
#pragma GCC diagnostic pop

int modem_tx_signal(modem_t modem, float *signal, int nsamples, int rate, float fc, char *id)
{
if (modem == NULL) return -1;
Expand Down Expand Up @@ -651,13 +641,3 @@ int modem_sget(modem_t modem, int index, char *target_name, char *param_name, ch
fjage_aid_destroy(aid);
return -1;
}

int modem_selftest(modem_t modem)
{
if (modem == NULL) return -1;
_modem_t *mm = modem;
int teststatus;
if (modem_iget(mm, 0, "org.arl.unet.Services.PHYSICAL", "post", &teststatus) < 0) return -1;
if (teststatus < 0 ) return -1;
return 0;
}
49 changes: 16 additions & 33 deletions unetsocket/c/unet.h
View file
Expand Up @@ -152,16 +152,6 @@ int modem_set_tx_callback(modem_t modem, modem_txcb_t callback);

int modem_get_range(modem_t modem, int to, float *range);

/// Get the range and bearing information
///
/// @param modem Gateway
/// @param to Address of the node to which range
/// and bearing is requested
/// @param range Measured range
/// @return 0 on success, -1 otherwise

int modem_get_range_and_bearing(modem_t modem, int to, float *range, float *bearing);

/// Transmit a signal.
///
/// For a 18-36 KHz modem, set fc to 24000 for baseband signal transmission
Expand Down Expand Up @@ -232,10 +222,10 @@ int modem_tx_wakeup(modem_t modem, char *id);
/// Setter for integer parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to be set
/// @return 0 on success, -1 otherwise
Expand All @@ -245,10 +235,10 @@ int modem_iset(modem_t modem, int index, char *target_name, char *param_name, in
/// Setter for float parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to be set
/// @return 0 on success, -1 otherwise
Expand All @@ -258,10 +248,10 @@ int modem_fset(modem_t modem, int index, char *target_name, char *param_name, fl
/// Setter for boolean parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to be set
/// @return 0 on success, -1 otherwise
Expand All @@ -271,10 +261,10 @@ int modem_bset(modem_t modem, int index, char *target_name, char *param_name, bo
/// Setter for String parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to be set
/// @return 0 on success, -1 otherwise
Expand All @@ -284,10 +274,10 @@ int modem_sset(modem_t modem, int index, char *target_name, char *param_name, ch
/// Getter for integer parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to get
/// @return 0 on success, -1 otherwise
Expand All @@ -297,10 +287,10 @@ int modem_iget(modem_t modem, int index, char *target_name, char *param_name, in
/// Getter for float parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Values to get
/// @return 0 on success, -1 otherwise
Expand All @@ -310,10 +300,10 @@ int modem_fget(modem_t modem, int index, char *target_name, char *param_name, fl
/// Getter for boolean parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param value Value to get
/// @return 0 on success, -1 otherwise
Expand All @@ -323,23 +313,16 @@ int modem_bget(modem_t modem, int index, char *target_name, char *param_name, bo
/// Getter for string parameters.
///
/// @param modem Gateway
/// @param index Set for indexed parameters (e.g parameters
/// @param index Set for indexed parameters (e.g paramaters
/// for CONTROL and DATA frames), For general
/// modem parameters index is set to 0
/// @param target_name Fully qualified service class name/ agent name
/// @param target_name Fully qulaified service class name/ agent name
/// @param param_name Parameter name
/// @param buf String to get
/// @param buflen Length of the string
/// @return 0 on success, -1 otherwise

int modem_sget(modem_t modem, int index, char *target_name, char *param_name, char *buf, int buflen);

/// Self test for Subnero modem
///
/// @param modem Gateway
/// @return 0 on PASS, -1 otherwise

int modem_selftest(modem_t modem);


#endif

0 comments on commit aa31d5d

Please sign in to comment.