updating other examples for the github action

Signed-off-by: Brenton Poke <[email protected]>
BrentonPoke · Oct 22, 2024 · d1346a3 · d1346a3
1 parent a3beb32
commit d1346a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/examples/Basic-Ducks/MamaDuck/MamaDuck.ino b/examples/Basic-Ducks/MamaDuck/MamaDuck.ino
@@ -32,8 +32,8 @@ void setup() {
   // setup the duck NOTE: The Device ID must be exactly 8 bytes otherwise it
   // will get rejected
   std::string deviceId("MAMA0001");
-  std::vector<byte> devId;
-  devId.insert(devId.end(), deviceId.begin(), deviceId.end());
+  std::array<byte,8> devId;
+  std::copy(deviceId.begin(), deviceId.end(), devId.begin());
   if (duck.setupWithDefaults(devId) != DUCK_ERR_NONE) {
     Serial.println("[MAMA] Failed to setup MamaDuck");
     return;

diff --git a/examples/Basic-Ducks/PapaDuck/PapaDuck.ino b/examples/Basic-Ducks/PapaDuck/PapaDuck.ino
@@ -118,15 +118,15 @@ int toJSON(CdpPacket packet)
   std::string dduid = ss.str();
   std::string muid(packet.muid.begin(), packet.muid.end());
 
-  Serial.println("[PAPA] topic:   " + std::string(toTopicString(packet.topic).c_str()));
+  loginfo_ln("[PAPA] topic:   %s", toTopicString(packet.topic).c_str());
 
-  Serial.println("[PAPA] sduid:   " + std::string(sduid.c_str()));
-  Serial.println("[PAPA] dduid:   " + std::string(dduid.c_str()));
+  loginfo_ln("[PAPA] sduid:   %s", sduid.c_str());
+  loginfo_ln("[PAPA] dduid:   %s", dduid.c_str());
 
-  Serial.println("[PAPA] muid:    " + std::string(muid.c_str()));
-  Serial.println("[PAPA] data:    " + std::string(payload.c_str()));
-  Serial.println("[PAPA] hops:    " + std::string(packet.hopCount));
-  Serial.println("[PAPA] duck:    " + std::string(packet.duckType));
+  loginfo_ln("[PAPA] muid:    %s", muid.c_str());
+  loginfo_ln("[PAPA] data:    %s", payload.c_str());
+  loginfo_ln("[PAPA] hops:    %s",  packet.hopCount);
+  loginfo_ln("[PAPA] duck:    %s", packet.duckType);
 
   doc["DeviceId"] = sduid;
   doc["topic"].set(toTopicString(packet.topic));
@@ -149,7 +149,7 @@ int toJSON(CdpPacket packet)
 void handleDuckData(std::vector<byte> packetBuffer)
 {
   Serial.print("\n[PAPA] --------------------------------------------------------------------------------------\n");
-  Serial.println("[PAPA] got packet: " + convertToHex(packetBuffer.data(), packetBuffer.size()));
+  loginfo_ln("[PAPA] got packet: %s", convertToHex(packetBuffer.data(), packetBuffer.size()).c_str());
 
   CdpPacket packet = CdpPacket(packetBuffer);
   toJSON(packet);
@@ -158,8 +158,8 @@ void handleDuckData(std::vector<byte> packetBuffer)
 void setup() 
 {
   std::string deviceId("PAPADUCK");
-  std::vector<byte> devId;
-  devId.insert(devId.end(), deviceId.begin(), deviceId.end());
+  std::array<byte,8> devId;
+  std::copy(deviceId.begin(), deviceId.end(), devId.begin());
   if (duck.setupWithDefaults(devId) != DUCK_ERR_NONE) {
     Serial.println("[PAPA] Failed to setup MamaDuck");
     setupOK = false;