status telemetry working - MWP tools issue?!

DroneBridge · Apr 7, 2018 · 4309cd4 · 4309cd4
1 parent d168fd8
commit 4309cd4
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 78 deletions.
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
             db_get_ip.c
             db_get_ip.h
             db_raw_receive.c
-            db_raw_receive.h db_raw_send_receive.c wifibroadcast.h lib.h db_crc.h shared_memory.c shared_memory.h
+            db_raw_receive.h db_raw_send_receive.c wifibroadcast.h wbc_lib.h db_crc.h shared_memory.c shared_memory.h
             mavlink msp_serial.c msp_serial.h db_crc.c)
 
 

diff --git a/common/lib.h b/common/lib.h
diff --git a/common/shared_memory.c b/common/shared_memory.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "db_protocol.h"
-#include "lib.h"
+#include "wbc_lib.h"
 
 wifibroadcast_rx_status_t *wbc_status_memory_open() {
     int fd;

diff --git a/common/shared_memory.h b/common/shared_memory.h
@@ -4,7 +4,7 @@
 // https://github.com/seeul8er/DroneBridge
 //
 
-#include "lib.h"
+#include "wbc_lib.h"
 #include "db_protocol.h"
 
 #ifndef CONTROL_STATUS_SHARED_MEMORY_H

diff --git a/common/wbc_lib.h b/common/wbc_lib.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "wifibroadcast.h"
+
+/*
+ * This file contains code licensed under GPL2. Code is part of EZ-WifiBroadcast project.
+ */
+
+typedef struct {
+    uint32_t received_packet_cnt;
+    uint32_t wrong_crc_cnt;
+    int8_t current_signal_dbm;
+    int8_t type; // 0 = Atheros, 1 = Ralink
+    int signal_good;
+} wifi_adapter_rx_status_t;
+
+typedef struct {
+    uint32_t received_packet_cnt;
+    uint32_t wrong_crc_cnt;
+    int8_t current_signal_dbm;
+    int8_t type;
+    int signal_good;
+} wifi_adapter_rx_status_t_uplink;
+
+typedef struct {
+    time_t last_update;
+    uint32_t received_block_cnt;
+    uint32_t damaged_block_cnt;
+    uint32_t lost_packet_cnt;
+    uint32_t received_packet_cnt;
+    uint32_t lost_per_block_cnt;
+    uint32_t tx_restart_cnt;
+    uint32_t kbitrate;
+    uint32_t wifi_adapter_cnt;
+    wifi_adapter_rx_status_t adapter[8];
+} wifibroadcast_rx_status_t;
+
+typedef struct {
+    time_t last_update;
+    uint32_t received_block_cnt;
+    uint32_t damaged_block_cnt;
+    uint32_t lost_packet_cnt;
+    uint32_t received_packet_cnt;
+    uint32_t lost_per_block_cnt;
+    uint32_t tx_restart_cnt;
+    uint32_t kbitrate;
+    uint32_t wifi_adapter_cnt;
+    wifi_adapter_rx_status_t adapter[8];
+} wifibroadcast_rx_status_t_rc;
+
+typedef struct {
+    time_t last_update;
+    uint8_t cpuload;
+    uint8_t temp;
+    uint32_t injected_block_cnt;
+    uint32_t skipped_fec_cnt;
+    uint32_t injection_fail_cnt;
+    long long injection_time_block;
+    uint16_t bitrate_kbit;
+    uint16_t bitrate_measured_kbit;
+    uint8_t cts;
+    uint8_t undervolt;
+} wifibroadcast_rx_status_t_sysair;
+
+typedef struct {
+    time_t last_update;
+    uint32_t injected_block_cnt;
+    uint32_t skipped_fec_cnt;
+    uint32_t injection_fail_cnt;
+    long long injection_time_block;
+} wifibroadcast_tx_status_t;
diff --git a/proxy/proxy_main.c b/proxy/proxy_main.c
@@ -16,7 +16,7 @@
 #include <arpa/inet.h>
 #include <signal.h>
 #include <stdbool.h>
-#include "../common/lib.h"
+#include "../common/wbc_lib.h"
 #include "../common/db_get_ip.h"
 #include "../common/db_protocol.h"
 #include "../common/db_raw_receive.h"

diff --git a/status/status_main.c b/status/status_main.c
@@ -1,6 +1,9 @@
 /*
  *   This file is part of DroneBridge: https://github.com/seeul8er/DroneBridge
  *
+ *   parts based on rx_status by Rodizio. Based on wifibroadcast rx by Befinitiv. Licensed under GPL2
+ *   integrated into the DroneBridge extensions by Wolfgang Christl
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; version 2.
@@ -14,8 +17,6 @@
  *   with this program; if not, write to the Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- *   parts based on rx_status by Rodizio. Based on wifibroadcast rx by Befinitiv. Licensed under GPL2
- *   integrated into the DroneBridge extensions by seeul8er
  */
 
 #include <stdio.h>
@@ -28,7 +29,7 @@
 #include <arpa/inet.h>
 #include <signal.h>
 #include <stdbool.h>
-#include "../common/lib.h"
+#include "../common/wbc_lib.h"
 #include "../common/db_get_ip.h"
 #include "../common/db_protocol.h"
 #include "../common/db_raw_receive.h"
@@ -87,7 +88,8 @@ int process_command_line_args(int argc, char *argv[]){
 int main(int argc, char *argv[]) {
     signal(SIGINT, intHandler);
     usleep((__useconds_t) 1e6);
-    int restarts = 0, udp_socket, shID, best_dbm = 0, cardcounter = 0, err, radiotap_length;
+    int restarts = 0, udp_socket, shID, cardcounter = 0, err, radiotap_length;
+    int8_t best_dbm = 0;
     ssize_t l;
     uint8_t counter = 0;
     uint8_t lr_buffer[DATA_UNI_LENGTH];
@@ -165,7 +167,7 @@ int main(int argc, char *argv[]) {
             wbc_rc_status->adapter[0].current_signal_dbm = db_sys_status_message.rssi_drone;
             wbc_rc_status->lost_packet_cnt = lr_buffer[radiotap_length + DB_RAW_V2_HEADER_LENGTH + 1];
         }
-        best_dbm = -1000;
+        best_dbm = -128;
         for(cardcounter=0; cardcounter<number_cards; ++cardcounter) {
             if (best_dbm < wbc_rx_status->adapter[cardcounter].current_signal_dbm)
                 best_dbm = wbc_rx_status->adapter[cardcounter].current_signal_dbm;