PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added sending unconfirmed message for RHF76

Browse Source 
1. added AT+ command "AT+MSGHEX" and change previous RHF76_ATCMD_FMT_SEND_MSGHEX to RHF76_ATCMD_FMT_SEND_CMSGHEX

2. implement send_unconfirmed with a non-breaking approach: added int (*send_unconfirmed)(const void *buf, size_t len); event handle in lora_module_st; added int tos_lora_module_send_unconfirmed(const void *buf, size_t len); in lora_module_wrapper.c; and implement static int rhf76_send_unconfirmed(const void *buf, size_t len) in RHF76.c

3. added { "+MSGHEX: PORT:", rhf76_incoming_data_process } in event array rhf76_at_event so that the device is able to process the downlink data when it is configurated to send unconfirmed message.

4. added AT+ command "AT+REPT", and implement the static int rhf76_set_repeat(uint8_t num) to enable user to set repeat times (1-15) while using "unconfirmed message"

5. updated the instructions of implemeting up-link parser and downlink parser on the server in the file "..\board\NUCLEO_STM32L073RZ\BSP\Src\lora_demo.c"
This commit is contained in:
Winfred LIN
2020-04-01 18:47:45 +11:00
parent eb6ffc8e95
commit cafe9c8a87
5 changed files with 127 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
board/NUCLEO_STM32L073RZ/BSP/Src/lora_demo.c
View File

@@ -1,8 +1,8 @@
#include "lora_demo.h"
#include "RHF76.h"
#include <Math.h>
#include "bsp.h"
#include <stdbool.h>
#include <Math.h>
/*
==================================================================================
@@ -19,11 +19,43 @@
step: 1
unit: %
property pressure pressure integer read-write range: [259, 1260]
initial: 260
step: 1
unit: hPa
property magnFullscale magnFullscale integer read-write range: [4, 16]
initial: 4
step: 1
unit: guass
property magn_x magn_x float read-write range: [-16, 16]
initial: 0
step: 1
unit: guass
property magn_y magn_y float read-write range: [-16, 16]
initial: 0
step: 1
unit: guass
property magn_z magn_z float read-write range: [-16, 16]
initial: 0
step: 1
unit: guass
property altitude altitude float read-write range: [-1000, 10000]
initial: 0
step: 1
unit: m
property isconfirmed isconfirmed bool read-write 0: confirmed message
1: unconfirmed message
property report_period period integer read-write range: [0, 3600]
initial: 0
step: 1
unit: second
==================================================================================
up-link parser javascript:
@@ -87,7 +119,7 @@
*/
uint16_t report_period = 10;
bool isconfirmed = false;
bool is_confirmed = true;
typedef struct device_data_st {
uint8_t magn_fullscale; // fullscale of magnetometer(RW)
@@ -126,7 +158,7 @@ void recv_callback(uint8_t *data, uint8_t len)
} else if (len >= 2) {
report_period = data[0] | (data[1] << 8);
LIS3MDL_Set_FullScale((LIS3MDL_FullScaleTypeDef)data[2]);
isconfirmed = (bool)data[3];
is_confirmed = (bool)data[3];
}
}
@@ -175,7 +207,12 @@ void application_entry(void *arg)
dev_data_wrapper.u.dev_data.pressure = (uint32_t)(sensor_data.sensor_press.pressure);
dev_data_wrapper.u.dev_data.period = report_period;
// send data to the server (via gateway)
tos_lora_module_send(dev_data_wrapper.u.serialize, sizeof(dev_data_t));
if(is_confirmed){
tos_lora_module_send(dev_data_wrapper.u.serialize, sizeof(dev_data_t));
}else{
tos_lora_module_send_unconfirmed(dev_data_wrapper.u.serialize, sizeof(dev_data_t));
}
tos_task_delay(report_period * 1000);
}
}