Просмотр исходного кода

Merge pull request #356 from jquatier/channel-name-fix

Fix for channel name display
ripplebiz 1 год назад
Родитель
Сommit
d755c6d6f0
1 измененных файлов с 9 добавлено и 2 удалено
  1. 9 2
      examples/companion_radio/main.cpp

+ 9 - 2
examples/companion_radio/main.cpp

@@ -625,7 +625,8 @@ protected:
       out_frame[i++] = RESP_CODE_CHANNEL_MSG_RECV;
     }
 
-    out_frame[i++] = findChannelIdx(channel);
+    uint8_t channel_idx = findChannelIdx(channel);
+    out_frame[i++] = channel_idx;
     uint8_t path_len = out_frame[i++] = pkt->isRouteFlood() ? pkt->path_len : 0xFF;
 
     out_frame[i++] = TXT_TYPE_PLAIN;
@@ -647,7 +648,13 @@ protected:
     #endif
     }
   #ifdef DISPLAY_CLASS
-    ui_task.newMsg(path_len, "Public", text, offline_queue_len);
+    // Get the channel name from the channel index
+    const char* channel_name = "Unknown";
+    ChannelDetails channel_details;
+    if (getChannel(channel_idx, channel_details)) {
+      channel_name = channel_details.name;
+    }
+    ui_task.newMsg(path_len, channel_name, text, offline_queue_len);
   #endif
   }