@@ -627,8 +627,8 @@ bool MKSService::sendNetworkFrame()
627
627
// Wifi_key Segment
628
628
strcpy ((char *)&_frame[dataOffset], s.c_str ());
629
629
dataOffset+=s.length ();
630
- } else if (NetConfig::getMode () == ESP_WIFI_AP || (NetConfig::getMode () == ESP_AP_SETUP) {
631
- log_esp3d (" AP Mode" );
630
+ } else if (NetConfig::getMode () == ESP_WIFI_AP || (NetConfig::getMode () == ESP_AP_SETUP)) {
631
+ log_esp3d (" AP Mode" );
632
632
// /////////////////////////////////
633
633
// IP Segment
634
634
// IP value
@@ -671,61 +671,61 @@ bool MKSService::sendNetworkFrame()
671
671
// Cloud Services port Segment
672
672
// hard coded
673
673
_frame[MKS_FRAME_DATA_OFFSET +4 ] = (telnet_server.port ()) & 0xff ;
674
- _frame[MKS_FRAME_DATA_OFFSET +5 ] = ((telnet_server.port ()) >> 8 ) & 0xff ;
675
- log_esp3d (" Cloud port: %d" , (telnet_server.port ()));
676
-
677
- // ////////////////////////////////
678
- // Cloud State Segment
679
- // hard coded as disabled in upstream FW
680
- _frame[dataOffset] = MKS_FRAME_CLOUD_DISABLED_STATE;
681
- dataOffset++;
682
- // ////////////////////////////////
683
- // Cloud host len Segment
684
- // Use ESP3D IP instead
685
- s = NetConfig::localIPAddress ().toString ();
686
- _frame[dataOffset] = s.length ();
687
- dataOffset++;
688
- // ////////////////////////////////
689
- // Cloud host Segment
690
- // Use ESP3D IP instead
691
- strcpy ((char *)&_frame[dataOffset], s.c_str ());
692
- dataOffset+=s.length ();
693
- // ////////////////////////////////
694
- // Cloud host port Segment
695
- // use webserver port instead
696
- _frame[dataOffset] = (HTTP_Server::port ()) & 0xff ;
697
- dataOffset++;
698
- _frame[dataOffset] = ((HTTP_Server::port ())>> 8 ) & 0xff ;
699
- dataOffset++;
700
- // ////////////////////////////////
701
- // Module id len Segment
702
- // Use hostname instead
703
- _frame[dataOffset] = strlen (_moduleId);
704
- dataOffset++;
705
- // ////////////////////////////////
706
- // Module id Segment
707
- strcpy ((char *)&_frame[dataOffset], _moduleId);
708
- dataOffset+=strlen (_moduleId);
709
- // ////////////////////////////////
710
- // FW version len Segment
711
- _frame[dataOffset] = strlen (FW_VERSION)+6 ;
712
- dataOffset++;
713
- // ////////////////////////////////
714
- // FW version Segment
715
- strcpy ((char *)&_frame[dataOffset], " ESP3D_" FW_VERSION);
716
- dataOffset+=strlen (FW_VERSION)+6 ;
717
- // ////////////////////////////////
718
- // Tail Segment
719
- _frame[dataOffset] = MKS_FRAME_TAIL_FLAG;
720
-
721
- // ////////////////////////////////
722
- // Data len Segment
723
- // Calculated from above
724
- _frame[MKS_FRAME_DATALEN_OFFSET] = (dataOffset-4 ) & 0xff ;
725
- _frame[MKS_FRAME_DATALEN_OFFSET+1 ] = ((dataOffset-4 ) >> 8 ) & 0xff ;
726
- log_esp3d (" Size of data in frame %d " , dataOffset-4 );
674
+ _frame[MKS_FRAME_DATA_OFFSET +5 ] = ((telnet_server.port ()) >> 8 ) & 0xff ;
675
+ log_esp3d (" Cloud port: %d" , (telnet_server.port ()));
676
+
677
+ // ////////////////////////////////
678
+ // Cloud State Segment
679
+ // hard coded as disabled in upstream FW
680
+ _frame[dataOffset] = MKS_FRAME_CLOUD_DISABLED_STATE;
681
+ dataOffset++;
682
+ // ////////////////////////////////
683
+ // Cloud host len Segment
684
+ // Use ESP3D IP instead
685
+ s = NetConfig::localIPAddress ().toString ();
686
+ _frame[dataOffset] = s.length ();
687
+ dataOffset++;
688
+ // ////////////////////////////////
689
+ // Cloud host Segment
690
+ // Use ESP3D IP instead
691
+ strcpy ((char *)&_frame[dataOffset], s.c_str ());
692
+ dataOffset+=s.length ();
693
+ // ////////////////////////////////
694
+ // Cloud host port Segment
695
+ // use webserver port instead
696
+ _frame[dataOffset] = (HTTP_Server::port ()) & 0xff ;
697
+ dataOffset++;
698
+ _frame[dataOffset] = ((HTTP_Server::port ())>> 8 ) & 0xff ;
699
+ dataOffset++;
700
+ // ////////////////////////////////
701
+ // Module id len Segment
702
+ // Use hostname instead
703
+ _frame[dataOffset] = strlen (_moduleId);
704
+ dataOffset++;
705
+ // ////////////////////////////////
706
+ // Module id Segment
707
+ strcpy ((char *)&_frame[dataOffset], _moduleId);
708
+ dataOffset+=strlen (_moduleId);
709
+ // ////////////////////////////////
710
+ // FW version len Segment
711
+ _frame[dataOffset] = strlen (FW_VERSION)+6 ;
712
+ dataOffset++;
713
+ // ////////////////////////////////
714
+ // FW version Segment
715
+ strcpy ((char *)&_frame[dataOffset], " ESP3D_" FW_VERSION);
716
+ dataOffset+=strlen (FW_VERSION)+6 ;
717
+ // ////////////////////////////////
718
+ // Tail Segment
719
+ _frame[dataOffset] = MKS_FRAME_TAIL_FLAG;
720
+
721
+ // ////////////////////////////////
722
+ // Data len Segment
723
+ // Calculated from above
724
+ _frame[MKS_FRAME_DATALEN_OFFSET] = (dataOffset-4 ) & 0xff ;
725
+ _frame[MKS_FRAME_DATALEN_OFFSET+1 ] = ((dataOffset-4 ) >> 8 ) & 0xff ;
726
+ log_esp3d (" Size of data in frame %d " , dataOffset-4 );
727
727
if (canSendFrame ()) {
728
- ESP3DOutput output (ESP_SERIAL_CLIENT);
728
+ ESP3DOutput output (ESP_SERIAL_CLIENT);
729
729
if (output.write (_frame,dataOffset+1 ) == (dataOffset+1 )) {
730
730
log_esp3d (" Ok" );
731
731
sendFrameDone ();
0 commit comments