Diff: main.cpp

Revision:

15:24dc42e5d7bf

Parent:

14:62c3fd006150

Child:

16:80f027a8b2bc

--- a/main.cpp	Mon Mar 13 10:58:50 2017 +0000
+++ b/main.cpp	Mon Mar 13 14:25:24 2017 +0000
@@ -11,16 +11,16 @@
 #define TX_OUTPUT_POWER                             14        // 14 dBm
 
 #define LORA_BANDWIDTH                              2         // [0: 125 kHz,
-                                                              //  1: 250 kHz,
-                                                              //  2: 500 kHz,
-                                                              //  3: Reserved]
-                                                              
+//  1: 250 kHz,
+//  2: 500 kHz,
+//  3: Reserved]
+
 #define LORA_SPREADING_FACTOR                       7         // [SF7..SF12]
 #define LORA_CODINGRATE                             1         // [1: 4/5,
-                                                              //  2: 4/6,
-                                                              //  3: 4/7,
-                                                              //  4: 4/8]
-                                                            
+//  2: 4/6,
+//  3: 4/7,
+//  4: 4/8]
+
 #define LORA_PREAMBLE_LENGTH                        8
 #define LORA_SYMBOL_TIMEOUT                         5         // Symbols
 #define LORA_FIX_LENGTH_PAYLOAD_ON                  false
@@ -33,22 +33,6 @@
 
 DigitalOut led(LED1);
 
-/*
- *  Global variables declarations
- */
-typedef enum {
-    LOWPOWER = 0,
-    IDLE,
-
-    TX,
-    TX_TIMEOUT,
-
-    CAD,
-    CAD_DONE
-} AppStates_t;
-
-volatile AppStates_t State = LOWPOWER;
-
 /*!
  * Radio events function pointer
  */
@@ -59,7 +43,7 @@
  */
 SX1272MB2xAS Radio( NULL );
 
-const uint8_t PingMsg[] = "PING";
+const uint8_t msg[] = "Temp=184.26 \r\nHumi=423.99 \r\n";
 
 uint16_t BufferSize = BUFFER_SIZE;
 uint8_t Buffer[BUFFER_SIZE];
@@ -104,28 +88,26 @@
 
     while( 1 ) {
         debug("\r\n========\r\nSending a new Packet\r\n========\r\n");
-        strcpy( ( char* )Buffer, ( char* )PingMsg );
+        strcpy( ( char* )Buffer, ( char* )msg );
         // We fill the buffer with numbers for the payload
         for( i = 4; i < BufferSize; i++ ) {
             Buffer[i] = i - 4;
         }
         wait_ms( 10 );
         Radio.Send( Buffer, BufferSize );
-        wait(3); 
+        wait(3);
     }
 }
 
 void OnTxDone( void )
 {
     Radio.Sleep( );
-    State = TX;
     debug_if( DEBUG_MESSAGE, "> OnTxDone\n\r" );
 }
 
 void OnTxTimeout( void )
 {
     Radio.Sleep( );
-    State = TX_TIMEOUT;
     debug_if( DEBUG_MESSAGE, "> OnTxTimeout\n\r" );
 }