@@ -52,8 +52,8 @@ void MeshBase::Update()
5252bool done =false ;
5353do {
5454uint8_t len = radio.getDynamicPayloadSize ();
55- uint8_t buff[40 ];
56- done = radio.read (buff,min ( len, sizeof (buff)) );
55+ byte buff[MAX_PAYLOAD_SIZE ];
56+ done = radio.read (buff, len);
5757HandlePacket (buff, len);
5858}while (!done);
5959}
@@ -85,7 +85,7 @@ void MeshBase::HandlePacket(const byte* data, uint8_t len)
8585const MeshBase::Message* msg = (struct MeshBase ::Message*)data;
8686uint8_t payload_length = len -sizeof (Message);
8787const byte* payload = data +sizeof (Message);
88- if (msg->split_enabled )
88+ if (msg->split_more || msg-> split_part != 0 )
8989{
9090// Re-assembly needed
9191// TODO: Re-assemble packets
@@ -98,6 +98,7 @@ void MeshBase::HandlePacket(const byte* data, uint8_t len)
9898OnMessage (msg, payload, payload_length);
9999break ;
100100}
101+ delete data;
101102}
102103}
103104
@@ -148,13 +149,13 @@ void MeshBase::SendMessage(uint32_t to, uint8_t type, const void* data, uint8_t
148149msg->ttl =0 ;
149150msg->type = type;
150151msg->address_from = address;
151- msg->split_enabled = length > MAX_PAYLOAD_SIZE;
152152
153153uint8_t num_pkts = (length / MAX_PAYLOAD_SIZE) +1 ;
154154for (uint8_t num =0 ; num < num_pkts; ++num)
155155{
156156uint8_t remaining_length = length - (num * MAX_PAYLOAD_SIZE);
157157msg->split_part = num;
158+ msg->split_more = remaining_length > MAX_PAYLOAD_SIZE;
158159memcpy (buff +sizeof (Message), (const byte*)data + (num * MAX_PAYLOAD_SIZE),min (remaining_length, MAX_PAYLOAD_SIZE));
159160
160161radio.stopListening ();