version v1.0.1804.1. Include support for $z and > 240pts configuration. Tested at 512pts.

mballesteros-IEEE · mballesteros-IEEE · commit d68cabe4541d · 2018-04-02T11:41:03.000+02:00
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=RFExplorer 3GP IoT
-version=1.0.1703
+version=1.0.1804
 author=RFExplorer Team
 maintainer=RF Explorer Team <contact@rf-explorer.com>
 sentence=Library reference for RFExplorer 3GP IoT
diff --git a/src/ByteBuffer_RFE.cpp b/src/ByteBuffer_RFE.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //Arduino Buffered Serial
 //A library that helps establish buffered serial communication with a
diff --git a/src/ByteBuffer_RFE.h b/src/ByteBuffer_RFE.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //Arduino Buffered Serial
 //A library that helps establish buffered serial communication with a
diff --git a/src/CommonValues.h b/src/CommonValues.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
diff --git a/src/ErrorCodes.h b/src/ErrorCodes.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
diff --git a/src/RFEConfiguration.cpp b/src/RFEConfiguration.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
diff --git a/src/RFEConfiguration.h b/src/RFEConfiguration.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
@@ -35,8 +35,10 @@ enum eModel
     MODEL_2400,     //4
     MODEL_WSUB3G,   //5
     MODEL_6G,       //6
+    
+    MODEL_WSUB1G_PLUS = 10,  //10
 
-    MODEL_RFGEN=60, //60
+    MODEL_RFGEN = 60, //60
     MODEL_NONE = 0xFF //0xFF
 };
 
@@ -53,11 +55,11 @@ enum eMode
 enum eCalculator
 {
     NORMAL = 0,
-    MAX = 1,
-    AVG = 2,
-    OVERWRITE = 3,
-    MAX_HOLD = 4,
-    MAX_HISTORICAL = 5,
+    MAX,
+    AVG,
+    OVERWRITE,
+    MAX_HOLD,
+    MAX_HISTORICAL,
     UNKNOWN = 0xff
 };
 
diff --git a/src/RFESweepData.cpp b/src/RFESweepData.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
@@ -46,12 +46,21 @@ uint8_t RFESweepData::processReceivedString(char* pLine, uint8_t* pLastMessage)
     uint8_t nReturnCode = _RFE_SUCCESS;
 
     uint16_t nSizeString = strlen(pLine);
+    uint8_t nAmplitudePosition = 3;
+    
+    //Note that pLine[2] may contains 0x00
+    if ('z' == pLine[1])
+    {
+        nSizeString = strlen(pLine + 4) + 4;
+        nAmplitudePosition = 4;
+    }        
 
     if (nSizeString >= 2) 
     {
-        if ((StartWith(pLine,"$s") && (nSizeString - 3 == (pLine[2] * 16))) || (StartWith(pLine,"$S") && (nSizeString - 3 == pLine[2])))
+        if ((StartWith(pLine,"$s") && (nSizeString - 3 == (pLine[2] * 16))) || (StartWith(pLine,"$S") && (nSizeString - 3 == pLine[2]))
+            || (StartWith(pLine,"$z") && (nSizeString - 4 == (pLine[3] + pLine[2] * 256))))
         {
-            memcpy(m_arrAmplitude, pLine + 3, m_nTotalSteps);
+            memcpy(m_arrAmplitude, pLine + nAmplitudePosition, m_nTotalSteps);
             m_bValid = true;
             *pLastMessage = _SWEEP_MESSAGE;
         }
diff --git a/src/RFESweepData.h b/src/RFESweepData.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
diff --git a/src/RFEUtilities.cpp b/src/RFEUtilities.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,7 @@ boolean StartWith(char*pLine, const char* pLineCompare)
 
 char * strcat(char * pLine, char cCharacter)
 {
-    uint16_t nSizeString = strlen(pLine);
-    pLine[nSizeString] = cCharacter;
-    pLine[nSizeString + 1] = '\0';
+    pLine[0] = cCharacter;
+    pLine[1] = '\0';
     return pLine;
 }
diff --git a/src/RFEUtilities.h b/src/RFEUtilities.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
 //Return 0 if is equal
 boolean StartWith(char*pLine, const char* pLineCompare);
 
-//Appends a copy of character to the destination string called pLine.
-//The terminating null character in destination is overwritten by the first character of source,
-//and a null-character is included at the end of the new string formed by the concatenation of both in destination.
+//Appends cCharacter to the pLine string, in the first pLine position. The function does not check for string length. 
+//The correct pLine pointer must be set outside this function before using it for correct operation. 
+//A null-character is set at the second position of the pLine string.
 char *strcat(char * pLine, char cCharacter);
 
 #endif
diff --git a/src/RFExplorer_3GP_IoT.cpp b/src/RFExplorer_3GP_IoT.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //This application is free software; you can redistribute it and/or
 //modify it under the terms of the GNU Lesser General Public
@@ -98,14 +98,14 @@ void RFExplorer_3GP_IoT::changeNumberSteps(uint16_t nSteps)
     switch (nSteps)
     {
         case 112:
-        sendCommand("#\x05" "CP" "\x06");
+        sendCommand("#\x05" "CJ" "\x06");
         break;
         case 240:
-        sendCommand("#\x05" "CP" "\x0E");
+        sendCommand("#\x05" "CJ" "\x0E");
         break;
         default:
         case 512:
-        sendCommand("#\x05" "CP" "\xFF");
+        sendCommand("#\x05" "CJ" "\x1F");
         break;
     }  
 }    
@@ -174,16 +174,18 @@ uint8_t RFExplorer_3GP_IoT::processReceivedString_GetNextLine()
 
     if(m_CircularBuffer.getSize() > 0)
     {
-        if ( m_nCharCounter < 3) //Catch first header received characters
+        if (m_nCharCounter < 4) 
         {
+            //Catch first header received characters from Circular Buffer to ensure that RF Explorer command is recognized
+            //Critical code because it is dependant of external loop
             cBufferRead = m_CircularBuffer.get();
             if ((m_nCharCounter!=0) || ((m_nCharCounter==0) && (('#' == cBufferRead) || ('$' == cBufferRead))))
             {
-                strcat(m_pLine, cBufferRead);
+                strcat(m_pLine + m_nCharCounter, cBufferRead);
                 m_nCharCounter++;
             }
         }
-        if (m_nCharCounter >= 3)
+        if (m_nCharCounter >= 4)
         {
             if('#' == m_pLine[0]) //#xxxx
             {
@@ -194,7 +196,7 @@ uint8_t RFExplorer_3GP_IoT::processReceivedString_GetNextLine()
                 }
                 while (bContinue && ('\r' != cBufferRead) && (m_nCharCounter < STRING_SIZE))
                 {
-                    strcat(m_pLine,cBufferRead);
+                    strcat(m_pLine + m_nCharCounter,cBufferRead);
                     m_nCharCounter++;
                     if (m_CircularBuffer.getSize()==0)
                     {
@@ -220,9 +222,21 @@ uint8_t RFExplorer_3GP_IoT::processReceivedString_GetNextLine()
             }
             else if('$' == m_pLine[0]) //$xxxx
             {
-                if (('s' == m_pLine[1]) || ('S' == m_pLine[1]))
+                if (('s' == m_pLine[1]) || ('S' == m_pLine[1]) || ('z' == m_pLine[1]))
                 {
                     uint16_t nMaxLengthMessage = m_pLine[2];
+                    if (m_pLine[1] == 's')
+                    {
+                        if (nMaxLengthMessage == 0)
+                            nMaxLengthMessage = 256;
+                            
+                        nMaxLengthMessage = (uint16_t)(nMaxLengthMessage * 16);
+                    }
+                    else if (m_pLine[1] == 'z')
+                    {
+                        nMaxLengthMessage *= 256;
+                        nMaxLengthMessage += m_pLine[3];
+                    }
                     if (nMaxLengthMessage <= MAX_SPECTRUM_STEPS)
                     {
                         bool bContinue = (m_CircularBuffer.getSize() > 0);
@@ -232,7 +246,7 @@ uint8_t RFExplorer_3GP_IoT::processReceivedString_GetNextLine()
                         }
                         while(bContinue && ('\r' != cBufferRead) && (m_nCharCounter < STRING_SIZE))
                         {
-                            strcat(m_pLine,cBufferRead);
+                            strcat(m_pLine + m_nCharCounter,cBufferRead);
                             m_nCharCounter++;
                             if (m_CircularBuffer.getSize() == 0)
                             {
diff --git a/src/RFExplorer_3GP_IoT.h b/src/RFExplorer_3GP_IoT.h
@@ -1,6 +1,6 @@
 //============================================================================
 //RF Explorer 3G+ IoT for Arduino - A Spectrum Analyzer for everyone!
-//Copyright � 2010-17 Ariel Rocholl, www.rf-explorer.com
+//Copyright � 2010-18 Ariel Rocholl, www.rf-explorer.com
 //
 //Contributed by:
 //       Manuel Ballesteros
@@ -40,7 +40,7 @@
 #define MONITOR_SERIAL
 
 #define _HEADER_LIB_3GP  "---RFExplorer 3G+ IoT Arduino---"
-#define _VERSION_LIB_3GP "-------Library v1.0.1701.1------"
+#define _VERSION_LIB_3GP "-------Library v1.0.1804.1------"
 
 //IOT RF Explorer is only supported by Arduino DUE  
 //and Seeeduino UNO (currently version 4.2) platforms, 
@@ -82,19 +82,20 @@ class RFExplorer_3GP_IoT
 //------------------------- Private Attributes---------------------------------
 
     private:
-    // Objects for storage configuration and data of RFE
+    //Objects for storage configuration and data of RFE
     RFEConfiguration m_objRFEConfiguration;
     RFESweepData m_objRFESweepData;
 
-    // Circular buffer for Rx data of RFExplorer 3G+ IoT
+    //Circular buffer for Rx data of RFExplorer 3G+ IoT
     ByteBuffer_RFE m_CircularBuffer;
     
     //String of message received from RFExplorer 3G+ IoT
     char m_pLine[STRING_SIZE];
+    //Critical counter of characters received in string message
     uint16_t m_nCharCounter;
 
 
-    //Number of error process at the beginning
+    //Number of errors from the beginning
     uint16_t m_nCounterError;
 
     //Current Baud rate
@@ -121,7 +122,7 @@ class RFExplorer_3GP_IoT
     //Returns: 0 if is possible to process otherwise ErrorCodes.
     uint8_t processReceivedString_GetNextLine();
     
-    //Clean m_pLine and allows new process
+    //Clean string message and allows new process
     void LineBufferInit();
  
 //------------------------- Public Methods ------------------------------------   
@@ -131,8 +132,8 @@ class RFExplorer_3GP_IoT
     //Call this function one time at the beginning.
     void init();
 
-    // Hardware restart to RF Explorer RFExplorer 3G+ IoT
-    // It place Reset pin of RFExplorer 3GP IoT at low level for a certain time.
+    //Hardware restart to RF Explorer RFExplorer 3G+ IoT
+    //It place Reset pin of RFExplorer 3GP IoT at low level for a certain time.
     void resetHardware() const;
      
     //Change RF Explorer UART module communication baud rate. The change is immediate and it is lost after a reset.
@@ -146,7 +147,7 @@ class RFExplorer_3GP_IoT
     //Recommended for Seeeduino - 240 steps
     void changeNumberSteps(uint16_t nSteps);
         
-    // Request RF Explorer command to receive Current_Config from RFExplorer 3G+ IoT
+    //Request RF Explorer command to receive Current_Config from RFExplorer 3G+ IoT
     void requestConfig();
 
     //It will change current configuration for RF.
@@ -201,9 +202,9 @@ class RFExplorer_3GP_IoT
     //Returns object system to use methods and properties of RFE_SweepData class.
     RFESweepData* getSweepData();
 
-    //Access to internal Software serial using for task debugging.
+    //Access to internal serial using for task debugging.
     //Different use between Arduino Due or Seeeduino
-    //See in definition of object m_objDebugSerialPort   
+    //See in definition of object m_objMonitorSerial   
     #if defined MONITOR_SERIAL
         #if defined (_SAM3XA_)
             HardwareSerial& getMonitorSerial() const;
