Skip to content

Commit e6f4646

Browse files
committed
fix(capi): extracting the fjage fix for byte array
1 parent c907380 commit e6f4646

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

unetsocket/c/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CC = gcc
22
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
3-
FJAGE_VER=7275142c2bc846d2f07400d7d628f213cb5b56ab
3+
FJAGE_VER=b49c7ac1b071ded3dbd2a58db39818da54a202ba
44
FJAGE_DIR=fjage-$(FJAGE_VER)
55
BUILD = build
66
BUILD_API = $(BUILD)/api

unetsocket/c/test/test_unet.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ int main(int argc, char* argv[]) {
114114
return -1;
115115
}
116116
// ranging
117-
rv = unetsocket_get_range(sock_tx, 31, &range);
117+
rv = unetsocket_ext_get_range(sock_tx, 31, &range);
118118
if (rv == 0) printf("Range measured is : %f \n", range);
119119
test_assert("Ranging", rv == 0);
120120
// send data
@@ -165,39 +165,39 @@ int main(int argc, char* argv[]) {
165165
test_assert("unetsocket_receive", strcmp("org.arl.unet.DatagramNtf", fjage_msg_get_clazz(ntf))==0);
166166
fjage_msg_destroy(ntf);
167167
// power level
168-
rv = unetsocket_set_powerlevel(sock_tx, 1, -6);
168+
rv = unetsocket_ext_set_powerlevel(sock_tx, 1, -6);
169169
test_assert("Power level", rv == 0);
170170
// set and get integer parameters
171-
rv = unetsocket_iget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", &framelength);
171+
rv = unetsocket_ext_iget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", &framelength);
172172
int itemp = framelength;
173173
test_assert("Get integer parameter", rv == 0);
174-
rv = unetsocket_iset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", 30);
175-
rv = unetsocket_iget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", &framelength);
174+
rv = unetsocket_ext_iset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", 30);
175+
rv = unetsocket_ext_iget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", &framelength);
176176
test_assert("Set integer parameter", ((rv == 0) && (framelength == 30)));
177-
unetsocket_iset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", itemp);
177+
unetsocket_ext_iset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "frameLength", itemp);
178178
// set and get float parameters
179-
rv = unetsocket_fget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", &powerlevel);
179+
rv = unetsocket_ext_fget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", &powerlevel);
180180
float ftemp = powerlevel;
181181
test_assert("Get float parameter", rv == 0);
182-
rv = unetsocket_fset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", -10.0);
183-
rv = unetsocket_fget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", &powerlevel);
182+
rv = unetsocket_ext_fset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", -10.0);
183+
rv = unetsocket_ext_fget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", &powerlevel);
184184
test_assert("Set float parameter", ((rv == 0) && ((int)(powerlevel) == -10)));
185-
unetsocket_fset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", ftemp);
185+
unetsocket_ext_fset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "powerLevel", ftemp);
186186
// set and get boolean parameters
187-
rv = unetsocket_bget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", &status);
187+
rv = unetsocket_ext_bget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", &status);
188188
bool btemp = status;
189189
test_assert("Get bool parameter", rv == 0);
190-
rv = unetsocket_bset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", false);
191-
rv = unetsocket_bget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", &status);
190+
rv = unetsocket_ext_bset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", false);
191+
rv = unetsocket_ext_bget(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", &status);
192192
test_assert("Set bool parameter", ((rv == 0) && (status == 0)));
193-
unetsocket_bset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", btemp);
193+
unetsocket_ext_bset(sock_tx, 1, "org.arl.unet.Services.PHYSICAL", "rxEnable", btemp);
194194
// set and get string parameters
195195
char s1[10];
196-
rv = unetsocket_sget(sock_tx, 0, "org.arl.unet.Services.TRANSPORT", "dsp", s1, 10);
196+
rv = unetsocket_ext_sget(sock_tx, 0, "org.arl.unet.Services.TRANSPORT", "dsp", s1, 10);
197197
test_assert("Get string parameter", rv == 0);
198-
rv = unetsocket_sset(sock_tx, 1, "org.arl.unet.Services.TRANSPORT", "dsp", "mac");
198+
rv = unetsocket_ext_sset(sock_tx, 1, "org.arl.unet.Services.TRANSPORT", "dsp", "mac");
199199
test_assert("Set string parameter", rv == 0);
200-
unetsocket_sset(sock_tx, 1, "org.arl.unet.Services.TRANSPORT", "dsp", s1);
200+
unetsocket_ext_sset(sock_tx, 1, "org.arl.unet.Services.TRANSPORT", "dsp", s1);
201201
// // close the unet socket connection
202202
rv = unetsocket_close(sock_tx);
203203
test_assert("unetsocket_close_tx", rv == 0);

0 commit comments

Comments
 (0)