You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/04/29 00:28:54 UTC
[16/19] incubator-mynewt-core git commit: MYNEWT-741 lorashell - Tx
predictable payloads
MYNEWT-741 lorashell - Tx predictable payloads
This allows the receiver to calculate packet error rate.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/3fe2ef75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/3fe2ef75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/3fe2ef75
Branch: refs/heads/master
Commit: 3fe2ef7574e1c1527e7b81082bc9c4184e38af05
Parents: 560fa92
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Apr 27 12:15:25 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Apr 28 17:27:52 2017 -0700
----------------------------------------------------------------------
apps/lorashell/src/main.c | 109 ++++++++++++++++++++++++++++++++---------
1 file changed, 85 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/3fe2ef75/apps/lorashell/src/main.c
----------------------------------------------------------------------
diff --git a/apps/lorashell/src/main.c b/apps/lorashell/src/main.c
index 68c8635..71a3018 100644
--- a/apps/lorashell/src/main.c
+++ b/apps/lorashell/src/main.c
@@ -33,8 +33,11 @@
* # Print message on each receive.
* lora_rx_verbose 1
*
- * # Keep receiving until manual stop.
- * lora_rx_rpt
+ * # Clear receive log
+ * lora_rx_info clear
+ *
+ * # Keep receiving 50-byte packets until manual stop.
+ * lora_rx_rpt 50
*
* # Display information about recent receives.
* lora_rx_info
@@ -79,6 +82,7 @@ static int lorashell_rx_entry_idx;
static int lorashell_rx_entry_cnt;
static int lorashell_rx_rpt;
+static int lorashell_rx_size;
static int lorashell_rx_verbose;
static int lorashell_txes_pending;
static uint8_t lorashell_tx_size;
@@ -117,6 +121,41 @@ static struct os_event lorashell_print_last_rx_ev = {
};
static struct os_callout lorashell_tx_timer;
+static const uint8_t lorashell_payload[UINT8_MAX] = {
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+};
+
static void
lorashell_rx_rpt_begin(void)
{
@@ -126,24 +165,13 @@ lorashell_rx_rpt_begin(void)
static void
lorashell_tx_timer_exp(struct os_event *ev)
{
- static uint8_t start_byte;
-
- uint8_t buf[UINT8_MAX];
- uint8_t b;
- int i;
-
if (lorashell_txes_pending <= 0) {
Radio.Sleep();
return;
}
lorashell_txes_pending--;
- b = start_byte++;
- for (i = 0; i < lorashell_tx_size; i++) {
- buf[i] = b++;
- }
-
- Radio.Send(buf, lorashell_tx_size);
+ Radio.Send((void *)lorashell_payload, lorashell_tx_size);
}
static const char *
@@ -178,13 +206,15 @@ on_tx_done(void)
static void
on_rx_done(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
{
-
struct lorashell_rx_entry *entry;
- if (!lorashell_rx_rpt) {
- Radio.Sleep();
- } else {
- lorashell_rx_rpt_begin();
+ if (lorashell_rx_size != 0) {
+ if (size != lorashell_rx_size ||
+ memcmp(payload, lorashell_payload, size) != 0) {
+
+ /* Packet error. */
+ goto done;
+ }
}
entry = lorashell_rx_entries + lorashell_rx_entry_idx;
@@ -204,6 +234,12 @@ on_rx_done(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
if (lorashell_rx_entry_cnt < MYNEWT_VAL(LORASHELL_NUM_RX_ENTRIES)) {
lorashell_rx_entry_cnt++;
}
+
+done:
+ Radio.Sleep();
+ if (lorashell_rx_rpt) {
+ lorashell_rx_rpt_begin();
+ }
}
static void
@@ -268,17 +304,42 @@ lorashell_avg_rx_entry(struct lorashell_rx_entry *out_entry)
static int
lorashell_rx_rpt_cmd(int argc, char **argv)
{
- if (argc > 1 && strcmp(argv[1], "stop") == 0) {
- lorashell_rx_rpt = 0;
- Radio.Sleep();
- console_printf("lora rx stopped\n");
- return 0;
+ const char *err;
+ int rc;
+
+ if (argc > 1) {
+ if (strcmp(argv[1], "stop") == 0) {
+ lorashell_rx_rpt = 0;
+ Radio.Sleep();
+ console_printf("lora rx stopped\n");
+ return 0;
+ }
+
+ lorashell_rx_size = parse_ull_bounds(argv[1], 0, UINT8_MAX, &rc);
+ if (rc != 0) {
+ err = "invalid size";
+ goto err;
+ }
+ } else {
+ lorashell_rx_size = 0;
}
lorashell_rx_rpt = 1;
lorashell_rx_rpt_begin();
return 0;
+
+err:
+ if (err != NULL) {
+ console_printf("error: %s\n", err);
+ }
+
+ console_printf(
+"usage:\n"
+" lora_rx_rpt [size]\n"
+" lora_rx_rpt stop\n");
+
+ return rc;
}
static int