print(most of the) pygate debug messages to telnet

Author: gijsio

esp32/pygate/hal/loragw_hal.c

@@ -37,12 +37,14 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 #include "loragw_aux.h"
 #include "loragw_radio.h"
 
+#include "py/mpprint.h"
+
 /* -------------------------------------------------------------------------- */
 /* --- PRIVATE MACROS ------------------------------------------------------- */
 #define DEBUG_HAL 1
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #if DEBUG_HAL == 1
-#define DEBUG_MSG(str)                fprintf(stderr, str)
+#define DEBUG_MSG(str)                mp_printf(&mp_plat_print,stderr, str)
 #define DEBUG_PRINTF(fmt, args...)    fprintf(stderr,"%s:%d: "fmt, __FUNCTION__, __LINE__, args)
 #define DEBUG_ARRAY(a,b,c)            for(a=0;a<b;++a) fprintf(stderr,"%x.",c[a]);fprintf(stderr,"end\n")
 #define CHECK_NULL(a)                 if(a==NULL){fprintf(stderr,"%s:%d: ERROR: NULL POINTER AS ARGUMENT\n", __FUNCTION__, __LINE__);return LGW_HAL_ERROR;}

esp32/pygate/lora_pkt_fwd/jitqueue.c

@@ -451,15 +451,15 @@ void jit_print_queue(struct jit_queue_s *queue, bool show_all) {
     int loop_end;
 
     if (jit_queue_is_empty(queue)) {
-        printf("[jit] queue is empty\n");
+        mp_printf(&mp_plat_print,"[jit] queue is empty\n");
     } else {
         pthread_mutex_lock(&mx_jit_queue);
 
-        printf("[jit] queue contains %d packets:\n", queue->num_pkt);
-        printf("[jit] queue contains %d beacons:\n", queue->num_beacon);
+        mp_printf(&mp_plat_print,"[jit] queue contains %d packets:\n", queue->num_pkt);
+        mp_printf(&mp_plat_print,"[jit] queue contains %d beacons:\n", queue->num_beacon);
         loop_end = (show_all == true) ? JIT_QUEUE_MAX : queue->num_pkt;
         for (i = 0; i < loop_end; i++) {
-            printf(" - node[%d]: count_us=%u - type=%d\n",
+            mp_printf(&mp_plat_print," - node[%d]: count_us=%u - type=%d\n",
                       i,
                       queue->nodes[i].pkt.count_us,
                       queue->nodes[i].pkt_type);

esp32/pygate/lora_pkt_fwd/jitqueue.h

@@ -34,6 +34,8 @@ Maintainer: Michael Coracin
 
 #include "loragw_hal.h"
 
+#include "py/mpprint.h"
+
 /* -------------------------------------------------------------------------- */
 /* --- PUBLIC CONSTANTS ----------------------------------------------------- */
 

esp32/pygate/lora_pkt_fwd/lora_pkt_fwd.c

@@ -1236,7 +1236,7 @@ void TASK_lora_gw(void *pvParameters) {
     }
 
     machine_pygate_set_status(PYGATE_STARTED);
-    printf("LoRa GW started\n");
+    mp_printf(&mp_plat_print,"LoRa GW started\n");
 
     /* main loop task : statistics collection */
     while (!exit_sig && !quit_sig) {
@@ -1325,32 +1325,32 @@ void TASK_lora_gw(void *pvParameters) {
 #if DEBUG_LEVEL >= INFO_
         if ( debug_level >= INFO_){
         MSG_INFO("[main] report\n##### %s #####\n", stat_timestamp);
-        printf("### [UPSTREAM] ###\n");
-        printf("# RF packets received by concentrator: %u\n", cp_nb_rx_rcv);
-        printf("# CRC_OK: %.2f%%, CRC_FAIL: %.2f%%, NO_CRC: %.2f%%\n", 100.0 * rx_ok_ratio, 100.0 * rx_bad_ratio, 100.0 * rx_nocrc_ratio);
-        printf("# RF packets forwarded: %u (%u bytes)\n", cp_up_pkt_fwd, cp_up_payload_byte);
-        printf("# PUSH_DATA datagrams sent: %u (%u bytes)\n", cp_up_dgram_sent, cp_up_network_byte);
-        printf("# PUSH_DATA acknowledged: %.2f%%\n", 100.0 * up_ack_ratio);
-        printf("### [DOWNSTREAM] ###\n");
-        printf("# PULL_DATA sent: %u (%.2f%% acknowledged)\n", cp_dw_pull_sent, 100.0 * dw_ack_ratio);
-        printf("# PULL_RESP(onse) datagrams received: %u (%u bytes)\n", cp_dw_dgram_rcv, cp_dw_network_byte);
-        printf("# RF packets sent to concentrator: %u (%u bytes)\n", (cp_nb_tx_ok + cp_nb_tx_fail), cp_dw_payload_byte);
-        printf("# TX errors: %u\n", cp_nb_tx_fail);
+        mp_printf(&mp_plat_print,"### [UPSTREAM] ###\n");
+        mp_printf(&mp_plat_print,"# RF packets received by concentrator: %u\n", cp_nb_rx_rcv);
+        mp_printf(&mp_plat_print,"# CRC_OK: %.2f%%, CRC_FAIL: %.2f%%, NO_CRC: %.2f%%\n", 100.0 * rx_ok_ratio, 100.0 * rx_bad_ratio, 100.0 * rx_nocrc_ratio);
+        mp_printf(&mp_plat_print,"# RF packets forwarded: %u (%u bytes)\n", cp_up_pkt_fwd, cp_up_payload_byte);
+        mp_printf(&mp_plat_print,"# PUSH_DATA datagrams sent: %u (%u bytes)\n", cp_up_dgram_sent, cp_up_network_byte);
+        mp_printf(&mp_plat_print,"# PUSH_DATA acknowledged: %.2f%%\n", 100.0 * up_ack_ratio);
+        mp_printf(&mp_plat_print,"### [DOWNSTREAM] ###\n");
+        mp_printf(&mp_plat_print,"# PULL_DATA sent: %u (%.2f%% acknowledged)\n", cp_dw_pull_sent, 100.0 * dw_ack_ratio);
+        mp_printf(&mp_plat_print,"# PULL_RESP(onse) datagrams received: %u (%u bytes)\n", cp_dw_dgram_rcv, cp_dw_network_byte);
+        mp_printf(&mp_plat_print,"# RF packets sent to concentrator: %u (%u bytes)\n", (cp_nb_tx_ok + cp_nb_tx_fail), cp_dw_payload_byte);
+        mp_printf(&mp_plat_print,"# TX errors: %u\n", cp_nb_tx_fail);
         if (cp_nb_tx_requested != 0 ) {
-            printf("# TX rejected (collision packet): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_collision_packet / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_collision_packet);
-            printf("# TX rejected (collision beacon): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_collision_beacon / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_collision_beacon);
-            printf("# TX rejected (too late): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_too_late / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_too_late);
-            printf("# TX rejected (too early): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_too_early / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_too_early);
+            mp_printf(&mp_plat_print,"# TX rejected (collision packet): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_collision_packet / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_collision_packet);
+            mp_printf(&mp_plat_print,"# TX rejected (collision beacon): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_collision_beacon / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_collision_beacon);
+            mp_printf(&mp_plat_print,"# TX rejected (too late): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_too_late / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_too_late);
+            mp_printf(&mp_plat_print,"# TX rejected (too early): %.2f%% (req:%u, rej:%u)\n", 100.0 * cp_nb_tx_rejected_too_early / cp_nb_tx_requested, cp_nb_tx_requested, cp_nb_tx_rejected_too_early);
         }
-        printf("### [JIT] ###\n");
+        mp_printf(&mp_plat_print,"### [JIT] ###\n");
         jit_print_queue (&jit_queue, false);
-        printf("### [GPS] ###\n");
+        mp_printf(&mp_plat_print,"### [GPS] ###\n");
         if (gps_fake_enable == true) {
-            printf("# GPS *FAKE* coordinates: latitude %.5f, longitude %.5f, altitude %i m\n", cp_gps_coord.lat, cp_gps_coord.lon, cp_gps_coord.alt);
+            mp_printf(&mp_plat_print,"# GPS *FAKE* coordinates: latitude %.5f, longitude %.5f, altitude %i m\n", cp_gps_coord.lat, cp_gps_coord.lon, cp_gps_coord.alt);
         } else {
-            printf("# GPS sync is disabled\n");
+            mp_printf(&mp_plat_print,"# GPS sync is disabled\n");
         }
-        printf("##### END #####\n");
+        mp_printf(&mp_plat_print,"##### END #####\n");
         }
 #endif
 

esp32/pygate/lora_pkt_fwd/lora_pkt_fwd.h

@@ -25,6 +25,8 @@ Maintainer: Michael Coracin
 #ifndef _LORA_PKTFWD_H
 #define _LORA_PKTFWD_H
 
+#include "py/mpprint.h"
+
 int lora_gw_init(char *);
 int lora_gw_get_debug_level();
 void lora_gw_set_debug_level(int level);

esp32/pygate/lora_pkt_fwd/trace.h

@@ -29,6 +29,8 @@ Maintainer: Michael Coracin
 #include <stdbool.h>
 #include "esp32_mphal.h"
 
+#include "py/mpprint.h"
+
 // debug levels
 #define DEBUG     4
 #define INFO_     3
@@ -43,7 +45,8 @@ extern int debug_level;
 #define MSG_DX(LEVEL, fmt, ...)                                                               \
             do  {                                                                             \
                 if (debug_level >= LEVEL)                                                     \
-                    printf("[%u] lorapf: " #LEVEL " " fmt, mp_hal_ticks_ms(), ##__VA_ARGS__); \
+                    mp_printf(&mp_plat_print, "hello world");                                 \
+                    mp_printf(&mp_plat_print, "[%u] lorapf: " #LEVEL " " fmt, mp_hal_ticks_ms(), ##__VA_ARGS__); \
             } while (0)
 
 #if DEBUG_LEVEL >= DEBUG