Skip to content

Commit 95c91c0

Browse files
twatteyneaditwatteyneadi
committed
sm_clib 1.0.1.7
1 parent 3266020 commit 95c91c0

File tree

7 files changed

+165
-73
lines changed

7 files changed

+165
-73
lines changed

‎sm_clib/dn_clib_build.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
enum {
66
// This is the build number used on the next release.
7-
VER_BUILD = 5
7+
VER_BUILD = 7
88
};

‎sm_clib/dn_ipmg.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, Dust Networks. All rights reserved.
2+
Copyright (c) 2015, Dust Networks. All rights reserved.
33
44
C library to connect to a SmartMesh IP Manager.
55

‎sm_clib/dn_ipmg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, Dust Networks. All rights reserved.
2+
Copyright (c) 2015, Dust Networks. All rights reserved.
33
44
C library to connect to a SmartMesh IP Manager.
55

‎sm_clib/dn_ipmt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, Dust Networks. All rights reserved.
2+
Copyright (c) 2015, Dust Networks. All rights reserved.
33
44
C library to connect to a SmartMesh IP Mote.
55

‎sm_clib/dn_ipmt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, Dust Networks. All rights reserved.
2+
Copyright (c) 2015, Dust Networks. All rights reserved.
33
44
C library to connect to a SmartMesh IP Mote.
55

‎sm_clib/dn_whmt.c‎

Lines changed: 116 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2014, Dust Networks. All rights reserved.
2+
Copyright (c) 2015, Dust Networks. All rights reserved.
33
44
C library to connect to a SmartMesh WirelessHART Mote.
55
@@ -1956,7 +1956,11 @@ dn_err_t dn_whmt_setNVParameter_macAddress(uint8_t memory, uint8_t* macAddr, dn_
19561956
}
19571957

19581958
// build outputBuf
1959-
dn_whmt_vars.outputBuf[0] = PARAMID_MACADDRESS;
1959+
dn_whmt_vars.outputBuf[0] = 0; // reserved
1960+
dn_whmt_vars.outputBuf[1] = 0; // reserved
1961+
dn_whmt_vars.outputBuf[2] = 0; // reserved
1962+
dn_whmt_vars.outputBuf[3] = 0; // reserved
1963+
dn_whmt_vars.outputBuf[4] = PARAMID_MACADDRESS;
19601964
memcpy(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_MACADDRESS_REQ_OFFS_MACADDR],macAddr,8);
19611965

19621966
// send outputBuf
@@ -2055,7 +2059,11 @@ dn_err_t dn_whmt_setNVParameter_joinKey(uint8_t memory, uint8_t* joinKey, dn_whm
20552059
}
20562060

20572061
// build outputBuf
2058-
dn_whmt_vars.outputBuf[0] = PARAMID_JOINKEY;
2062+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2063+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2064+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2065+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2066+
dn_whmt_vars.outputBuf[4] = PARAMID_JOINKEY;
20592067
memcpy(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_JOINKEY_REQ_OFFS_JOINKEY],joinKey,16);
20602068

20612069
// send outputBuf
@@ -2163,7 +2171,11 @@ dn_err_t dn_whmt_setNVParameter_networkId(uint8_t memory, uint16_t networkId, dn
21632171
}
21642172

21652173
// build outputBuf
2166-
dn_whmt_vars.outputBuf[0] = PARAMID_NETWORKID;
2174+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2175+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2176+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2177+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2178+
dn_whmt_vars.outputBuf[4] = PARAMID_NETWORKID;
21672179
dn_write_uint16_t(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_NETWORKID_REQ_OFFS_NETWORKID],networkId);
21682180

21692181
// send outputBuf
@@ -2266,7 +2278,11 @@ dn_err_t dn_whmt_setNVParameter_txPower(uint8_t memory, int8_t txPower, dn_whmt_
22662278
}
22672279

22682280
// build outputBuf
2269-
dn_whmt_vars.outputBuf[0] = PARAMID_TXPOWER;
2281+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2282+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2283+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2284+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2285+
dn_whmt_vars.outputBuf[4] = PARAMID_TXPOWER;
22702286
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_TXPOWER_REQ_OFFS_TXPOWER] = (int8_t)txPower;
22712287

22722288
// send outputBuf
@@ -2364,7 +2380,11 @@ dn_err_t dn_whmt_setNVParameter_powerInfo(uint8_t memory, uint8_t powerSource, u
23642380
}
23652381

23662382
// build outputBuf
2367-
dn_whmt_vars.outputBuf[0] = PARAMID_POWERINFO;
2383+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2384+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2385+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2386+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2387+
dn_whmt_vars.outputBuf[4] = PARAMID_POWERINFO;
23682388
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_POWERINFO_REQ_OFFS_POWERSOURCE] = powerSource;
23692389
dn_write_uint16_t(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_POWERINFO_REQ_OFFS_DISCHARGECUR],dischargeCur);
23702390
dn_write_uint32_t(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_POWERINFO_REQ_OFFS_DISCHARGETIME],dischargeTime);
@@ -2473,7 +2493,11 @@ dn_err_t dn_whmt_setNVParameter_ttl(uint8_t memory, uint8_t timeToLive, dn_whmt_
24732493
}
24742494

24752495
// build outputBuf
2476-
dn_whmt_vars.outputBuf[0] = PARAMID_TTL;
2496+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2497+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2498+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2499+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2500+
dn_whmt_vars.outputBuf[4] = PARAMID_TTL;
24772501
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_TTL_REQ_OFFS_TIMETOLIVE] = timeToLive;
24782502

24792503
// send outputBuf
@@ -2575,7 +2599,11 @@ dn_err_t dn_whmt_setNVParameter_HARTantennaGain(uint8_t memory, int8_t antennaGa
25752599
}
25762600

25772601
// build outputBuf
2578-
dn_whmt_vars.outputBuf[0] = PARAMID_HARTANTENNAGAIN;
2602+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2603+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2604+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2605+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2606+
dn_whmt_vars.outputBuf[4] = PARAMID_HARTANTENNAGAIN;
25792607
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_HARTANTENNAGAIN_REQ_OFFS_ANTENNAGAIN] = (int8_t)antennaGain;
25802608

25812609
// send outputBuf
@@ -2679,7 +2707,11 @@ dn_err_t dn_whmt_setNVParameter_OTAPlockout(uint8_t memory, uint8_t otapLockout,
26792707
}
26802708

26812709
// build outputBuf
2682-
dn_whmt_vars.outputBuf[0] = PARAMID_OTAPLOCKOUT;
2710+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2711+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2712+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2713+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2714+
dn_whmt_vars.outputBuf[4] = PARAMID_OTAPLOCKOUT;
26832715
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_OTAPLOCKOUT_REQ_OFFS_OTAPLOCKOUT] = otapLockout;
26842716

26852717
// send outputBuf
@@ -2781,7 +2813,11 @@ dn_err_t dn_whmt_setNVParameter_hrCounterMode(uint8_t memory, uint8_t hrCounterM
27812813
}
27822814

27832815
// build outputBuf
2784-
dn_whmt_vars.outputBuf[0] = PARAMID_HRCOUNTERMODE;
2816+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2817+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2818+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2819+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2820+
dn_whmt_vars.outputBuf[4] = PARAMID_HRCOUNTERMODE;
27852821
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_HRCOUNTERMODE_REQ_OFFS_HRCOUNTERMODE] = hrCounterMode;
27862822

27872823
// send outputBuf
@@ -2883,7 +2919,11 @@ dn_err_t dn_whmt_setNVParameter_autojoin(uint8_t memory, uint32_t reserved, uint
28832919
}
28842920

28852921
// build outputBuf
2886-
dn_whmt_vars.outputBuf[0] = PARAMID_AUTOJOIN;
2922+
dn_whmt_vars.outputBuf[0] = 0; // reserved
2923+
dn_whmt_vars.outputBuf[1] = 0; // reserved
2924+
dn_whmt_vars.outputBuf[2] = 0; // reserved
2925+
dn_whmt_vars.outputBuf[3] = 0; // reserved
2926+
dn_whmt_vars.outputBuf[4] = PARAMID_AUTOJOIN;
28872927
dn_write_uint32_t(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_AUTOJOIN_REQ_OFFS_RESERVED],reserved);
28882928
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_AUTOJOIN_REQ_OFFS_NVPARAMID] = nvParamId;
28892929
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_AUTOJOIN_REQ_OFFS_AUTOJOIN] = autojoin;
@@ -2988,7 +3028,11 @@ dn_err_t dn_whmt_setNVParameter_compliantMode(uint8_t memory, uint8_t compliantM
29883028
}
29893029

29903030
// build outputBuf
2991-
dn_whmt_vars.outputBuf[0] = PARAMID_COMPLIANTMODE;
3031+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3032+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3033+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3034+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3035+
dn_whmt_vars.outputBuf[4] = PARAMID_COMPLIANTMODE;
29923036
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_COMPLIANTMODE_REQ_OFFS_COMPLIANTMODE] = compliantMode;
29933037

29943038
// send outputBuf
@@ -3090,7 +3134,11 @@ dn_err_t dn_whmt_setNVParameter_lock(uint8_t memory, uint8_t code, uint16_t mast
30903134
}
30913135

30923136
// build outputBuf
3093-
dn_whmt_vars.outputBuf[0] = PARAMID_LOCK;
3137+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3138+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3139+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3140+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3141+
dn_whmt_vars.outputBuf[4] = PARAMID_LOCK;
30943142
dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_LOCK_REQ_OFFS_CODE] = code;
30953143
dn_write_uint16_t(&dn_whmt_vars.outputBuf[DN_SETNVPARAMETER_LOCK_REQ_OFFS_MASTER],master);
30963144

@@ -3188,7 +3236,11 @@ dn_err_t dn_whmt_getNVParameter_macAddress(dn_whmt_getNVParameter_macAddress_rpt
31883236
extraFlags = 0x00;
31893237

31903238
// build outputBuf
3191-
dn_whmt_vars.outputBuf[0] = PARAMID_MACADDRESS;
3239+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3240+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3241+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3242+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3243+
dn_whmt_vars.outputBuf[4] = PARAMID_MACADDRESS;
31923244

31933245
// send outputBuf
31943246
rc = dn_serial_mt_sendRequest(
@@ -3281,7 +3333,11 @@ dn_err_t dn_whmt_getNVParameter_networkId(dn_whmt_getNVParameter_networkId_rpt*
32813333
extraFlags = 0x00;
32823334

32833335
// build outputBuf
3284-
dn_whmt_vars.outputBuf[0] = PARAMID_NETWORKID;
3336+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3337+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3338+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3339+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3340+
dn_whmt_vars.outputBuf[4] = PARAMID_NETWORKID;
32853341

32863342
// send outputBuf
32873343
rc = dn_serial_mt_sendRequest(
@@ -3374,7 +3430,11 @@ dn_err_t dn_whmt_getNVParameter_txPower(dn_whmt_getNVParameter_txPower_rpt* repl
33743430
extraFlags = 0x00;
33753431

33763432
// build outputBuf
3377-
dn_whmt_vars.outputBuf[0] = PARAMID_TXPOWER;
3433+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3434+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3435+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3436+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3437+
dn_whmt_vars.outputBuf[4] = PARAMID_TXPOWER;
33783438

33793439
// send outputBuf
33803440
rc = dn_serial_mt_sendRequest(
@@ -3467,7 +3527,11 @@ dn_err_t dn_whmt_getNVParameter_powerInfo(dn_whmt_getNVParameter_powerInfo_rpt*
34673527
extraFlags = 0x00;
34683528

34693529
// build outputBuf
3470-
dn_whmt_vars.outputBuf[0] = PARAMID_POWERINFO;
3530+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3531+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3532+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3533+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3534+
dn_whmt_vars.outputBuf[4] = PARAMID_POWERINFO;
34713535

34723536
// send outputBuf
34733537
rc = dn_serial_mt_sendRequest(
@@ -3565,7 +3629,11 @@ dn_err_t dn_whmt_getNVParameter_ttl(dn_whmt_getNVParameter_ttl_rpt* reply) {
35653629
extraFlags = 0x00;
35663630

35673631
// build outputBuf
3568-
dn_whmt_vars.outputBuf[0] = PARAMID_TTL;
3632+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3633+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3634+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3635+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3636+
dn_whmt_vars.outputBuf[4] = PARAMID_TTL;
35693637

35703638
// send outputBuf
35713639
rc = dn_serial_mt_sendRequest(
@@ -3660,7 +3728,11 @@ dn_err_t dn_whmt_getNVParameter_HARTantennaGain(dn_whmt_getNVParameter_HARTanten
36603728
extraFlags = 0x00;
36613729

36623730
// build outputBuf
3663-
dn_whmt_vars.outputBuf[0] = PARAMID_HARTANTENNAGAIN;
3731+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3732+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3733+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3734+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3735+
dn_whmt_vars.outputBuf[4] = PARAMID_HARTANTENNAGAIN;
36643736

36653737
// send outputBuf
36663738
rc = dn_serial_mt_sendRequest(
@@ -3754,7 +3826,11 @@ dn_err_t dn_whmt_getNVParameter_OTAPlockout(dn_whmt_getNVParameter_OTAPlockout_r
37543826
extraFlags = 0x00;
37553827

37563828
// build outputBuf
3757-
dn_whmt_vars.outputBuf[0] = PARAMID_OTAPLOCKOUT;
3829+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3830+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3831+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3832+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3833+
dn_whmt_vars.outputBuf[4] = PARAMID_OTAPLOCKOUT;
37583834

37593835
// send outputBuf
37603836
rc = dn_serial_mt_sendRequest(
@@ -3850,7 +3926,11 @@ dn_err_t dn_whmt_getNVParameter_hrCounterMode(dn_whmt_getNVParameter_hrCounterMo
38503926
extraFlags = 0x00;
38513927

38523928
// build outputBuf
3853-
dn_whmt_vars.outputBuf[0] = PARAMID_HRCOUNTERMODE;
3929+
dn_whmt_vars.outputBuf[0] = 0; // reserved
3930+
dn_whmt_vars.outputBuf[1] = 0; // reserved
3931+
dn_whmt_vars.outputBuf[2] = 0; // reserved
3932+
dn_whmt_vars.outputBuf[3] = 0; // reserved
3933+
dn_whmt_vars.outputBuf[4] = PARAMID_HRCOUNTERMODE;
38543934

38553935
// send outputBuf
38563936
rc = dn_serial_mt_sendRequest(
@@ -3944,7 +4024,11 @@ dn_err_t dn_whmt_getNVParameter_autojoin(uint32_t reserved, uint8_t nvParamId, d
39444024
extraFlags = 0x00;
39454025

39464026
// build outputBuf
3947-
dn_whmt_vars.outputBuf[0] = PARAMID_AUTOJOIN;
4027+
dn_whmt_vars.outputBuf[0] = 0; // reserved
4028+
dn_whmt_vars.outputBuf[1] = 0; // reserved
4029+
dn_whmt_vars.outputBuf[2] = 0; // reserved
4030+
dn_whmt_vars.outputBuf[3] = 0; // reserved
4031+
dn_whmt_vars.outputBuf[4] = PARAMID_AUTOJOIN;
39484032
dn_write_uint32_t(&dn_whmt_vars.outputBuf[DN_GETNVPARAMETER_AUTOJOIN_REQ_OFFS_RESERVED],reserved);
39494033
dn_whmt_vars.outputBuf[DN_GETNVPARAMETER_AUTOJOIN_REQ_OFFS_NVPARAMID] = nvParamId;
39504034

@@ -4047,7 +4131,11 @@ dn_err_t dn_whmt_getNVParameter_compliantMode(dn_whmt_getNVParameter_compliantMo
40474131
extraFlags = 0x00;
40484132

40494133
// build outputBuf
4050-
dn_whmt_vars.outputBuf[0] = PARAMID_COMPLIANTMODE;
4134+
dn_whmt_vars.outputBuf[0] = 0; // reserved
4135+
dn_whmt_vars.outputBuf[1] = 0; // reserved
4136+
dn_whmt_vars.outputBuf[2] = 0; // reserved
4137+
dn_whmt_vars.outputBuf[3] = 0; // reserved
4138+
dn_whmt_vars.outputBuf[4] = PARAMID_COMPLIANTMODE;
40514139

40524140
// send outputBuf
40534141
rc = dn_serial_mt_sendRequest(
@@ -4142,7 +4230,11 @@ dn_err_t dn_whmt_getNVParameter_lock(dn_whmt_getNVParameter_lock_rpt* reply) {
41424230
extraFlags = 0x00;
41434231

41444232
// build outputBuf
4145-
dn_whmt_vars.outputBuf[0] = PARAMID_LOCK;
4233+
dn_whmt_vars.outputBuf[0] = 0; // reserved
4234+
dn_whmt_vars.outputBuf[1] = 0; // reserved
4235+
dn_whmt_vars.outputBuf[2] = 0; // reserved
4236+
dn_whmt_vars.outputBuf[3] = 0; // reserved
4237+
dn_whmt_vars.outputBuf[4] = PARAMID_LOCK;
41464238

41474239
// send outputBuf
41484240
rc = dn_serial_mt_sendRequest(

0 commit comments

Comments
 (0)