Simple implementation of LoRaWAN-demo-76 by Semtech.

Dependencies:   mbed LoRaWAN-lib SX1276Lib

Dependents:   simple-demo-76_revised_20171113 simple-demo-76_revised_20171208

Fork of LoRaWAN-demo-76 by Semtech

Files at this revision

API Documentation at this revision

Comitter:
joshcurry
Date:
Mon Oct 30 10:51:44 2017 +0000
Parent:
9:ee9dcbb9708d
Commit message:
Simplified Code;

Changed in this revision

app/Commissioning.h Show diff for this revision Revisions of this file
app/SerialDisplay.cpp Show diff for this revision Revisions of this file
app/SerialDisplay.h Show diff for this revision Revisions of this file
app/main.cpp Show annotated file Show diff for this revision Revisions of this file
app/vt100.h Show diff for this revision Revisions of this file
diff -r ee9dcbb9708d -r 9364ab3a08eb app/Commissioning.h
--- a/app/Commissioning.h	Mon Apr 24 13:38:31 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- / _____)             _              | |
-( (____  _____ ____ _| |_ _____  ____| |__
- \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- _____) ) ____| | | || |_| ____( (___| | | |
-(______/|_____)_|_|_| \__)_____)\____)_| |_|
-    (C)2015 Semtech
-
-Description: End device commissioning parameters
-
-License: Revised BSD License, see LICENSE.TXT file include in the project
-
-Maintainer: Miguel Luis and Gregory Cristian
-*/
-#ifndef __LORA_COMMISSIONING_H__
-#define __LORA_COMMISSIONING_H__
-
-/*!
- * When set to 1 the application uses the Over-the-Air activation procedure
- * When set to 0 the application uses the Personalization activation procedure
- */
-#define OVER_THE_AIR_ACTIVATION                     1
-
-/*!
- * Indicates if the end-device is to be connected to a private or public network
- */
-#define LORAWAN_PUBLIC_NETWORK                      true
-
-/*!
- * IEEE Organizationally Unique Identifier ( OUI ) (big endian)
- * \remark This is unique to a company or organization
- */
-#define IEEE_OUI                                    0x11, 0x22, 0x33
-
-/*!
- * Mote device IEEE EUI (big endian)
- */
-#define LORAWAN_DEVICE_EUI                          { IEEE_OUI, 0x44, 0x55, 0x66, 0x77, 0x88 }
-
-/*!
- * Application IEEE EUI (big endian)
- */
-#define LORAWAN_APPLICATION_EUI                     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
-
-/*!
- * AES encryption/decryption cipher application key
- */
-#define LORAWAN_APPLICATION_KEY                     { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
-
-/*!
- * Current network ID
- */
-#define LORAWAN_NETWORK_ID                          ( uint32_t )0
-
-/*!
- * Device address on the network (big endian)
- */
-#define LORAWAN_DEVICE_ADDRESS                      ( uint32_t )0x12345678
-
-/*!
- * AES encryption/decryption cipher network session key
- */
-#define LORAWAN_NWKSKEY                             { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
-
-/*!
- * AES encryption/decryption cipher application session key
- */
-#define LORAWAN_APPSKEY                             { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }
-
-#endif // __LORA_COMMISSIONING_H__
diff -r ee9dcbb9708d -r 9364ab3a08eb app/SerialDisplay.cpp
--- a/app/SerialDisplay.cpp	Mon Apr 24 13:38:31 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,444 +0,0 @@
-/*
- / _____)             _              | |
-( (____  _____ ____ _| |_ _____  ____| |__
- \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- _____) ) ____| | | || |_| ____( (___| | | |
-(______/|_____)_|_|_| \__)_____)\____)_| |_|
-    (C)2015 Semtech
-
-Description: VT100 serial display management
-
-License: Revised BSD License, see LICENSE.TXT file include in the project
-
-Maintainer: Miguel Luis and Gregory Cristian
-*/
-#include "board.h"
-#include "vt100.h"
-#include "SerialDisplay.h"
-
-VT100 vt( USBTX, USBRX );
-
-void SerialPrintCheckBox( bool activated, uint8_t color )
-{
-    if( activated == true )
-    {
-        vt.SetAttribute( VT100::ATTR_OFF, color, color );
-    }
-    else
-    {
-        vt.SetAttribute( VT100::ATTR_OFF );
-    }
-    vt.printf( " " );
-    vt.SetAttribute( VT100::ATTR_OFF );
-}
-
-void SerialDisplayUpdateActivationMode( bool otaa )
-{
-    vt.SetCursorPos( 4, 17 );
-    SerialPrintCheckBox( otaa, VT100::WHITE );
-    vt.SetCursorPos( 9, 17 );
-    SerialPrintCheckBox( !otaa, VT100::WHITE );
-}
-
-void SerialDisplayUpdateEui( uint8_t line, uint8_t *eui )
-{
-    vt.SetCursorPos( line, 27 );
-    for( uint8_t i = 0; i < 8; i++ )
-    {
-        vt.printf( "%02X ", eui[i] );
-    }
-    vt.SetCursorPos( line, 50 );
-    vt.printf( "]" );
-}
-
-void SerialDisplayUpdateKey( uint8_t line, uint8_t *key )
-{
-    vt.SetCursorPos( line, 27 );
-    for( uint8_t i = 0; i < 16; i++ )
-    {
-        vt.printf( "%02X ", key[i] );
-    }
-    vt.SetCursorPos( line, 74 );
-    vt.printf( "]" );
-}
-
-void SerialDisplayUpdateNwkId( uint8_t id )
-{
-    vt.SetCursorPos( 10, 27 );
-    vt.printf( "%03d", id );
-}
-
-void SerialDisplayUpdateDevAddr( uint32_t addr )
-{
-    vt.SetCursorPos( 11, 27 );
-    vt.printf( "%02X %02X %02X %02X", ( addr >> 24 ) & 0xFF, ( addr >> 16 ) & 0xFF, ( addr >> 8 ) & 0xFF, addr & 0xFF );
-}
-
-void SerialDisplayUpdateFrameType( bool confirmed )
-{
-    vt.SetCursorPos( 15, 17 );
-    SerialPrintCheckBox( confirmed, VT100::WHITE );
-    vt.SetCursorPos( 15, 32 );
-    SerialPrintCheckBox( !confirmed, VT100::WHITE );
-}
-
-void SerialDisplayUpdateAdr( bool adr )
-{
-    vt.SetCursorPos( 16, 27 );
-    if( adr == true )
-    {
-        vt.printf( " ON" );
-    }
-    else
-    {
-        vt.printf( "OFF" );
-    }
-}
-
-void SerialDisplayUpdateDutyCycle( bool dutyCycle )
-{
-    vt.SetCursorPos( 17, 27 );
-    if( dutyCycle == true )
-    {
-        vt.printf( " ON" );
-    }
-    else
-    {
-        vt.printf( "OFF" );
-    }
-}
-
-void SerialDisplayUpdatePublicNetwork( bool network )
-{
-    vt.SetCursorPos( 19, 17 );
-    SerialPrintCheckBox( network, VT100::WHITE );
-    vt.SetCursorPos( 19, 30 );
-    SerialPrintCheckBox( !network, VT100::WHITE );
-}
-
-void SerialDisplayUpdateNetworkIsJoined( bool state )
-{
-    vt.SetCursorPos( 20, 17 );
-    SerialPrintCheckBox( !state, VT100::RED );
-    vt.SetCursorPos( 20, 30 );
-    SerialPrintCheckBox( state, VT100::GREEN );
-}
-
-void SerialDisplayUpdateLedState( uint8_t id, uint8_t state )
-{
-    switch( id )
-    {
-        case 1:
-            vt.SetCursorPos( 22, 17 );
-            SerialPrintCheckBox( state, VT100::RED );
-            break;
-        case 2:
-            vt.SetCursorPos( 22, 31 );
-            SerialPrintCheckBox( state, VT100::GREEN );
-            break;
-        case 3:
-            vt.SetCursorPos( 22, 45 );
-            SerialPrintCheckBox( state, VT100::BLUE );
-            break;
-    }
-}
-
-void SerialDisplayUpdateData( uint8_t line, uint8_t *buffer, uint8_t size )
-{
-    if( size != 0 )
-    {
-        vt.SetCursorPos( line, 27 );
-        for( uint8_t i = 0; i < size; i++ )
-        {
-            vt.printf( "%02X ", buffer[i] );
-            if( ( ( i + 1 ) % 16 ) == 0 )
-            {
-                line++;
-                vt.SetCursorPos( line, 27 );
-            }
-        }
-        for( uint8_t i = size; i < 64; i++ )
-        {
-            vt.printf( "__ " );
-            if( ( ( i + 1 ) % 16 ) == 0 )
-            {
-                line++;
-                vt.SetCursorPos( line, 27 );
-            }
-        }
-        vt.SetCursorPos( line - 1, 74 );
-        vt.printf( "]" );
-    }
-    else
-    {
-        vt.SetCursorPos( line, 27 );
-        for( uint8_t i = 0; i < 64; i++ )
-        {
-            vt.printf( "__ " );
-            if( ( ( i + 1 ) % 16 ) == 0 )
-            {
-                line++;
-                vt.SetCursorPos( line, 27 );
-            }
-        }
-        vt.SetCursorPos( line - 1, 74 );
-        vt.printf( "]" );
-    }
-}
-
-void SerialDisplayUpdateUplinkAcked( bool state )
-{
-    vt.SetCursorPos( 24, 36 );
-    SerialPrintCheckBox( state, VT100::GREEN );
-}
-
-void SerialDisplayUpdateUplink( bool acked, uint8_t datarate, uint16_t counter, uint8_t port, uint8_t *buffer, uint8_t bufferSize )
-{
-    // Acked
-    SerialDisplayUpdateUplinkAcked( acked );
-    // Datarate
-    vt.SetCursorPos( 25, 33 );
-    vt.printf( "DR%d", datarate );
-    // Counter
-    vt.SetCursorPos( 26, 27 );
-    vt.printf( "%10d", counter );
-    // Port
-    vt.SetCursorPos( 27, 34 );
-    vt.printf( "%3d", port );
-    // Data
-    SerialDisplayUpdateData( 28, buffer, bufferSize );
-    // Help message
-    vt.SetCursorPos( 42, 1 );
-    vt.printf( "To refresh screen please hit 'r' key." );
-}
-
-void SerialDisplayUpdateDonwlinkRxData( bool state )
-{
-    vt.SetCursorPos( 34, 4 );
-    SerialPrintCheckBox( state, VT100::GREEN );
-}
-
-void SerialDisplayUpdateDownlink( bool rxData, int16_t rssi, int8_t snr, uint16_t counter, uint8_t port, uint8_t *buffer, uint8_t bufferSize )
-{
-    // Rx data
-    SerialDisplayUpdateDonwlinkRxData( rxData );
-    // RSSI
-    vt.SetCursorPos( 33, 32 );
-    vt.printf( "%5d", rssi );
-    // SNR
-    vt.SetCursorPos( 34, 32 );
-    vt.printf( "%5d", snr );
-    // Counter
-    vt.SetCursorPos( 35, 27 );
-    vt.printf( "%10d", counter );
-    if( rxData == true )
-    {
-        // Port
-        vt.SetCursorPos( 36, 34 );
-        vt.printf( "%3d", port );
-        // Data
-        SerialDisplayUpdateData( 37, buffer, bufferSize );
-    }
-    else
-    {
-        // Port
-        vt.SetCursorPos( 36, 34 );
-        vt.printf( "   " );
-        // Data
-        SerialDisplayUpdateData( 37, NULL, 0 );
-    }
-}
-
-void SerialDisplayDrawFirstLine( void )
-{
-    vt.PutBoxDrawingChar( 'l' );
-    for( int8_t i = 0; i <= 77; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'k' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayDrawTitle( const char* title )
-{
-    vt.PutBoxDrawingChar( 'x' );
-    vt.printf( "%s", title );
-    vt.PutBoxDrawingChar( 'x' );
-    vt.printf( "\r\n" );
-}
-void SerialDisplayDrawTopSeparator( void )
-{
-    vt.PutBoxDrawingChar( 't' );
-    for( int8_t i = 0; i <= 11; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'w' );
-    for( int8_t i = 0; i <= 64; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'u' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayDrawColSeparator( void )
-{
-    vt.PutBoxDrawingChar( 'x' );
-    for( int8_t i = 0; i <= 11; i++ )
-    {
-        vt.PutBoxDrawingChar( ' ' );
-    }
-    vt.PutBoxDrawingChar( 't' );
-    for( int8_t i = 0; i <= 64; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'u' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayDrawSeparator( void )
-{
-    vt.PutBoxDrawingChar( 't' );
-    for( int8_t i = 0; i <= 11; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'n' );
-    for( int8_t i = 0; i <= 64; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'u' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayDrawLine( const char* firstCol, const char* secondCol )
-{
-    vt.PutBoxDrawingChar( 'x' );
-    vt.printf( "%s", firstCol );
-    vt.PutBoxDrawingChar( 'x' );
-    vt.printf( "%s", secondCol );
-    vt.PutBoxDrawingChar( 'x' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayDrawBottomLine( void )
-{
-    vt.PutBoxDrawingChar( 'm' );
-    for( int8_t i = 0; i <= 11; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'v' );
-    for( int8_t i = 0; i <= 64; i++ )
-    {
-        vt.PutBoxDrawingChar( 'q' );
-    }
-    vt.PutBoxDrawingChar( 'j' );
-    vt.printf( "\r\n" );
-}
-
-void SerialDisplayInit( void )
-{
-    vt.ClearScreen( 2 );
-    vt.SetCursorMode( false );
-    vt.SetCursorPos( 0, 0 );
-    
-    // "+-----------------------------------------------------------------------------+" );
-    SerialDisplayDrawFirstLine( );
-    // "¦                      LoRaWAN Demonstration Application                      ¦" );
-    SerialDisplayDrawTitle( "                      LoRaWAN Demonstration Application                       " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawTopSeparator( );
-    // "¦ Activation ¦ [ ]Over The Air                                                ¦" );
-    SerialDisplayDrawLine( " Activation ", " [ ]Over The Air                                                 " );
-    // "¦            ¦ DevEui    [__ __ __ __ __ __ __ __]                            ¦" );
-    SerialDisplayDrawLine( "            ", " DevEui    [__ __ __ __ __ __ __ __]                             " );
-    // "¦            ¦ AppEui    [__ __ __ __ __ __ __ __]                            ¦" );
-    SerialDisplayDrawLine( "            ", " AppEui    [__ __ __ __ __ __ __ __]                             " );
-    // "¦            ¦ AppKey  [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]      ¦" );
-    SerialDisplayDrawLine( "            ", " AppKey    [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]     " );
-    // "¦            +----------------------------------------------------------------¦" );
-    SerialDisplayDrawColSeparator( );
-    // "¦            ¦ [x]Personalisation                                             ¦" );
-    SerialDisplayDrawLine( "            ", " [ ]Personalisation                                              " );
-    // "¦            ¦ NwkId     [___]                                                ¦" );
-    SerialDisplayDrawLine( "            ", " NwkId     [___]                                                 " );
-    // "¦            ¦ DevAddr   [__ __ __ __]                                        ¦" );
-    SerialDisplayDrawLine( "            ", " DevAddr   [__ __ __ __]                                         " );
-    // "¦            ¦ NwkSKey   [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]    ¦" );
-    SerialDisplayDrawLine( "            ", " NwkSKey   [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]     " );
-    // "¦            ¦ AppSKey   [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]    ¦" );
-    SerialDisplayDrawLine( "            ", " AppSKey   [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __]     " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawSeparator( );
-    // "¦ MAC params ¦ [ ]Confirmed / [ ]Unconfirmed                                  ¦" );
-    SerialDisplayDrawLine( " MAC params ", " [ ]Confirmed / [ ]Unconfirmed                                   " );
-    // "¦            ¦ ADR       [   ]                                                ¦" );
-    SerialDisplayDrawLine( "            ", " ADR       [   ]                                                 " );
-    // "¦            ¦ Duty cycle[   ]                                                ¦" );
-    SerialDisplayDrawLine( "            ", " Duty cycle[   ]                                                 " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawSeparator( );
-    // "¦ Network    ¦ [ ]Public  / [ ]Private                                        ¦" );
-    SerialDisplayDrawLine( " Network    ", " [ ]Public  / [ ]Private                                         " );
-    // "¦            ¦ [ ]Joining / [ ]Joined                                         ¦" );
-    SerialDisplayDrawLine( "            ", " [ ]Joining / [ ]Joined                                          " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawSeparator( );
-    // "¦ LED status ¦ [ ]LED1(Tx) / [ ]LED2(Rx) / [ ]LED3(App)                       ¦" );
-    SerialDisplayDrawLine( " LED status ", " [ ]LED1(Tx) / [ ]LED2(Rx) / [ ]LED3(App)                        " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawSeparator( );
-    // "¦ Uplink     ¦ Acked              [ ]                                         ¦" );
-    SerialDisplayDrawLine( " Uplink     ", " Acked              [ ]                                          " );
-    // "¦            ¦ Datarate        [    ]                                         ¦" );
-    SerialDisplayDrawLine( "            ", " Datarate        [    ]                                          " );
-    // "¦            ¦ Counter   [          ]                                         ¦" );
-    SerialDisplayDrawLine( "            ", " Counter   [          ]                                          " );
-    // "¦            ¦ Port             [   ]                                         ¦" );
-    SerialDisplayDrawLine( "            ", " Port             [   ]                                          " );
-    // "¦            ¦ Data      [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", " Data      [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "+------------+----------------------------------------------------------------¦" );
-    SerialDisplayDrawSeparator( );
-    // "¦ Downlink   ¦ RSSI           [     ] dBm                                     ¦" );
-    SerialDisplayDrawLine( " Downlink   ", " RSSI           [     ] dBm                                      " );
-    // "¦ [ ]Data    ¦ SNR      [     ] dB                                            ¦" );
-    SerialDisplayDrawLine( " [ ]Data    ", " SNR            [     ] dB                                       " );
-    // "¦            ¦ Counter  [          ]                                          ¦" );
-    // "¦            ¦ Counter   [          ]                                         ¦" );
-    SerialDisplayDrawLine( "            ", " Counter   [          ]                                          " );
-    // "¦            ¦ Port             [   ]                                         ¦" );
-    SerialDisplayDrawLine( "            ", " Port             [   ]                                          " );
-    // "¦            ¦ Data      [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", " Data      [__ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "¦            ¦            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __     ¦" );
-    SerialDisplayDrawLine( "            ", "            __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __      " );
-    // "+------------+----------------------------------------------------------------+" );
-    SerialDisplayDrawBottomLine( );
-    vt.printf( "To refresh screen please hit 'r' key.\r\n" );
-}
-
-bool SerialDisplayReadable( void )
-{
-    return vt.Readable( );
-}
-
-uint8_t SerialDisplayGetChar( void )
-{
-    return vt.GetChar( );
-}
diff -r ee9dcbb9708d -r 9364ab3a08eb app/SerialDisplay.h
--- a/app/SerialDisplay.h	Mon Apr 24 13:38:31 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- / _____)             _              | |
-( (____  _____ ____ _| |_ _____  ____| |__
- \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- _____) ) ____| | | || |_| ____( (___| | | |
-(______/|_____)_|_|_| \__)_____)\____)_| |_|
-    (C)2015 Semtech
-
-Description: VT100 serial display management
-
-License: Revised BSD License, see LICENSE.TXT file include in the project
-
-Maintainer: Miguel Luis and Gregory Cristian
-*/
-#ifndef __SERIAL_DISPLAY_H__
-#define __SERIAL_DISPLAY_H__
-
-void SerialDisplayInit( void );
-void SerialDisplayUpdateUplink( bool acked, uint8_t datarate, uint16_t counter, uint8_t port, uint8_t *buffer, uint8_t bufferSize );
-void SerialDisplayUpdateDownlink( bool rxData, int16_t rssi, int8_t snr, uint16_t counter, uint8_t port, uint8_t *buffer, uint8_t bufferSize );
-void SerialDisplayPrintCheckBox( bool activated );
-void SerialDisplayUpdateLedState( uint8_t id, uint8_t state );
-void SerialDisplayUpdateActivationMode( bool otaa );
-void SerialDisplayUpdateEui( uint8_t line, uint8_t *eui );
-void SerialDisplayUpdateKey( uint8_t line, uint8_t *key );
-void SerialDisplayUpdateNwkId( uint8_t id );
-void SerialDisplayUpdateDevAddr( uint32_t addr );
-void SerialDisplayUpdateFrameType( bool confirmed );
-void SerialDisplayUpdateAdr( bool adr );
-void SerialDisplayUpdateDutyCycle( bool dutyCycle );
-void SerialDisplayUpdatePublicNetwork( bool network );
-void SerialDisplayUpdateData( uint8_t *buffer );
-void SerialDisplayUpdateNetworkIsJoined( bool state );
-void SerialDisplayUpdateUplinkAcked( bool state );
-void SerialDisplayUpdateDonwlinkRxData( bool state );
-bool SerialDisplayReadable( void );
-uint8_t SerialDisplayGetChar( void );
-
-#endif // __SERIAL_DISPLAY_H__
diff -r ee9dcbb9708d -r 9364ab3a08eb app/main.cpp
--- a/app/main.cpp	Mon Apr 24 13:38:31 2017 +0000
+++ b/app/main.cpp	Mon Oct 30 10:51:44 2017 +0000
@@ -15,951 +15,105 @@
 #include "mbed.h"
 #include "board.h"
 #include "radio.h"
-
 #include "LoRaMac.h"
-#include "Commissioning.h"
-#include "SerialDisplay.h"
-
-/*!
- * Defines the application data transmission duty cycle. 5s, value in [ms].
- */
-#define APP_TX_DUTYCYCLE                            5000
-
-/*!
- * Defines a random delay for application data transmission duty cycle. 1s,
- * value in [ms].
- */
-#define APP_TX_DUTYCYCLE_RND                        1000
 
-/*!
- * Default datarate
- */
-#define LORAWAN_DEFAULT_DATARATE                    DR_0
-
-/*!
- * LoRaWAN confirmed messages
- */
-#define LORAWAN_CONFIRMED_MSG_ON                    true
-
-/*!
- * LoRaWAN Adaptive Data Rate
- *
- * \remark Please note that when ADR is enabled the end-device should be static
- */
-#define LORAWAN_ADR_ON                              1
-
-#if defined( USE_BAND_868 )
-
-#include "LoRaMacTest.h"
 
-/*!
- * LoRaWAN ETSI duty cycle control enable/disable
- *
- * \remark Please note that ETSI mandates duty cycled transmissions. Use only for test purposes
- */
-#define LORAWAN_DUTYCYCLE_ON                        false
-
-#define USE_SEMTECH_DEFAULT_CHANNEL_LINEUP          1
-
-#if( USE_SEMTECH_DEFAULT_CHANNEL_LINEUP == 1 )
-
-#define LC4                { 867100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC5                { 867300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC6                { 867500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC7                { 867700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC8                { 867900000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC9                { 868800000, { ( ( DR_7 << 4 ) | DR_7 ) }, 2 }
-#define LC10               { 868300000, { ( ( DR_6 << 4 ) | DR_6 ) }, 1 }
-
-#endif
-
-#endif
+#define APPDATA_SIZE 4
+#define LORAWAN_DEFAULT_DATARATE DR_0
+#define LORAWAN_DEVICE_ADDRESS                      ( uint32_t )0x01234567
+#define LORAWAN_NWKSKEY                             { 0x11, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
+#define LORAWAN_APPSKEY                             { 0x11, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
 
-/*!
- * LoRaWAN application port
- */
-#define LORAWAN_APP_PORT                            15
-
-/*!
- * User application data buffer size
- */
-#if ( LORAWAN_CONFIRMED_MSG_ON == 1 )
-#define LORAWAN_APP_DATA_SIZE                       6
-
-#else
-#define LORAWAN_APP_DATA_SIZE                       1
-
-#endif
-
-static uint8_t DevEui[] = LORAWAN_DEVICE_EUI;
-static uint8_t AppEui[] = LORAWAN_APPLICATION_EUI;
-static uint8_t AppKey[] = LORAWAN_APPLICATION_KEY;
-
-#if( OVER_THE_AIR_ACTIVATION == 0 )
-
+uint8_t AppData[APPDATA_SIZE];
 static uint8_t NwkSKey[] = LORAWAN_NWKSKEY;
 static uint8_t AppSKey[] = LORAWAN_APPSKEY;
 
-/*!
- * Device address
- */
-static uint32_t DevAddr = LORAWAN_DEVICE_ADDRESS;
 
-#endif
-
-/*!
- * Application port
- */
-static uint8_t AppPort = LORAWAN_APP_PORT;
-
-/*!
- * User application data size
- */
-static uint8_t AppDataSize = LORAWAN_APP_DATA_SIZE;
-
-/*!
- * User application data buffer size
- */
-#define LORAWAN_APP_DATA_MAX_SIZE                           64
-
-/*!
- * User application data
- */
-static uint8_t AppData[LORAWAN_APP_DATA_MAX_SIZE];
-
-/*!
- * Indicates if the node is sending confirmed or unconfirmed messages
- */
-static uint8_t IsTxConfirmed = LORAWAN_CONFIRMED_MSG_ON;
-
-/*!
- * Defines the application data transmission duty cycle
- */
-static uint32_t TxDutyCycleTime;
-
-/*!
- * Timer to handle the application data transmission duty cycle
- */
-static TimerEvent_t TxNextPacketTimer;
-
-/*!
- * Specifies the state of the application LED
- */
-static bool AppLedStateOn = false;
-volatile bool Led3StateChanged = false;
-/*!
- * Timer to handle the state of LED1
- */
-static TimerEvent_t Led1Timer;
-volatile bool Led1State = false;
-volatile bool Led1StateChanged = false;
-/*!
- * Timer to handle the state of LED2
- */
-static TimerEvent_t Led2Timer;
-volatile bool Led2State = false;
-volatile bool Led2StateChanged = false;
-
-/*!
- * Indicates if a new packet can be sent
- */
-static bool NextTx = true;
-
-/*!
- * Device states
- */
-static enum eDeviceState
-{
-    DEVICE_STATE_INIT,
-    DEVICE_STATE_JOIN,
-    DEVICE_STATE_SEND,
-    DEVICE_STATE_CYCLE,
-    DEVICE_STATE_SLEEP
-}DeviceState;
-
-/*!
- * LoRaWAN compliance tests support data
- */
-struct ComplianceTest_s
-{
-    bool Running;
-    uint8_t State;
-    bool IsTxConfirmed;
-    uint8_t AppPort;
-    uint8_t AppDataSize;
-    uint8_t *AppDataBuffer;
-    uint16_t DownLinkCounter;
-    bool LinkCheck;
-    uint8_t DemodMargin;
-    uint8_t NbGateways;
-}ComplianceTest;
-
-/*
- * SerialDisplay managment variables
- */
-
-/*!
- * Indicates if the MAC layer network join status has changed.
- */
-static bool IsNetworkJoinedStatusUpdate = false;
-
-/*!
- * Strucure containing the Uplink status
- */
-struct sLoRaMacUplinkStatus
-{
-    uint8_t Acked;
-    int8_t Datarate;
-    uint16_t UplinkCounter;
-    uint8_t Port;
-    uint8_t *Buffer;
-    uint8_t BufferSize;
-}LoRaMacUplinkStatus;
-volatile bool UplinkStatusUpdated = false;
-
-/*!
- * Strucure containing the Downlink status
- */
-struct sLoRaMacDownlinkStatus
-{
-    int16_t Rssi;
-    int8_t Snr;
-    uint16_t DownlinkCounter;
-    bool RxData;
-    uint8_t Port;
-    uint8_t *Buffer;
-    uint8_t BufferSize;
-}LoRaMacDownlinkStatus;
-volatile bool DownlinkStatusUpdated = false;
-
-void SerialDisplayRefresh( void )
-{
-    MibRequestConfirm_t mibReq;
-
-    SerialDisplayInit( );
-    SerialDisplayUpdateActivationMode( OVER_THE_AIR_ACTIVATION );
-
-#if( OVER_THE_AIR_ACTIVATION == 0 )
-    SerialDisplayUpdateNwkId( LORAWAN_NETWORK_ID );
-    SerialDisplayUpdateDevAddr( DevAddr );
-    SerialDisplayUpdateKey( 12, NwkSKey );
-    SerialDisplayUpdateKey( 13, AppSKey );
-#endif
-    SerialDisplayUpdateEui( 5, DevEui );
-    SerialDisplayUpdateEui( 6, AppEui );
-    SerialDisplayUpdateKey( 7, AppKey );
-
-    mibReq.Type = MIB_NETWORK_JOINED;
-    LoRaMacMibGetRequestConfirm( &mibReq );
-    SerialDisplayUpdateNetworkIsJoined( mibReq.Param.IsNetworkJoined );
 
-    SerialDisplayUpdateAdr( LORAWAN_ADR_ON );
-#if defined( USE_BAND_868 )
-    SerialDisplayUpdateDutyCycle( LORAWAN_DUTYCYCLE_ON );
-#else
-    SerialDisplayUpdateDutyCycle( false );
-#endif
-    SerialDisplayUpdatePublicNetwork( LORAWAN_PUBLIC_NETWORK );
-    
-    SerialDisplayUpdateLedState( 3, AppLedStateOn );
-}
-
-void SerialRxProcess( void )
-{
-    if( SerialDisplayReadable( ) == true )
-    {
-        switch( SerialDisplayGetChar( ) )
-        {
-            case 'R':
-            case 'r':
-                // Refresh Serial screen
-                SerialDisplayRefresh( );
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-/*!
- * \brief   Prepares the payload of the frame
- */
-static void PrepareTxFrame( uint8_t port )
-{
-    switch( port )
-    {
-    case 15:
-        {
-            AppData[0] = AppLedStateOn;
-            if( IsTxConfirmed == true )
-            {
-                AppData[1] = LoRaMacDownlinkStatus.DownlinkCounter >> 8;
-                AppData[2] = LoRaMacDownlinkStatus.DownlinkCounter;
-                AppData[3] = LoRaMacDownlinkStatus.Rssi >> 8;
-                AppData[4] = LoRaMacDownlinkStatus.Rssi;
-                AppData[5] = LoRaMacDownlinkStatus.Snr;
-            }
-        }
-        break;
-    case 224:
-        if( ComplianceTest.LinkCheck == true )
-        {
-            ComplianceTest.LinkCheck = false;
-            AppDataSize = 3;
-            AppData[0] = 5;
-            AppData[1] = ComplianceTest.DemodMargin;
-            AppData[2] = ComplianceTest.NbGateways;
-            ComplianceTest.State = 1;
-        }
-        else
-        {
-            switch( ComplianceTest.State )
-            {
-            case 4:
-                ComplianceTest.State = 1;
-                break;
-            case 1:
-                AppDataSize = 2;
-                AppData[0] = ComplianceTest.DownLinkCounter >> 8;
-                AppData[1] = ComplianceTest.DownLinkCounter;
-                break;
-            }
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-/*!
- * \brief   Prepares the payload of the frame
- *
- * \retval  [0: frame could be send, 1: error]
- */
-static bool SendFrame( void )
+void McpsConfirm( McpsConfirm_t *mcpsConfirm )
 {
-    McpsReq_t mcpsReq;
-    LoRaMacTxInfo_t txInfo;
-
-    if( LoRaMacQueryTxPossible( AppDataSize, &txInfo ) != LORAMAC_STATUS_OK )
-    {
-        // Send empty frame in order to flush MAC commands
-        mcpsReq.Type = MCPS_UNCONFIRMED;
-        mcpsReq.Req.Unconfirmed.fBuffer = NULL;
-        mcpsReq.Req.Unconfirmed.fBufferSize = 0;
-        mcpsReq.Req.Unconfirmed.Datarate = LORAWAN_DEFAULT_DATARATE;
-
-        LoRaMacUplinkStatus.Acked = false;
-        LoRaMacUplinkStatus.Port = 0;
-        LoRaMacUplinkStatus.Buffer = NULL;
-        LoRaMacUplinkStatus.BufferSize = 0;
-        SerialDisplayUpdateFrameType( false );
-    }
-    else
-    {
-        LoRaMacUplinkStatus.Acked = false;
-        LoRaMacUplinkStatus.Port = AppPort;
-        LoRaMacUplinkStatus.Buffer = AppData;
-        LoRaMacUplinkStatus.BufferSize = AppDataSize;
-        SerialDisplayUpdateFrameType( IsTxConfirmed );
-
-        if( IsTxConfirmed == false )
-        {
-            mcpsReq.Type = MCPS_UNCONFIRMED;
-            mcpsReq.Req.Unconfirmed.fPort = AppPort;
-            mcpsReq.Req.Unconfirmed.fBuffer = AppData;
-            mcpsReq.Req.Unconfirmed.fBufferSize = AppDataSize;
-            mcpsReq.Req.Unconfirmed.Datarate = LORAWAN_DEFAULT_DATARATE;
-        }
-        else
-        {
-            mcpsReq.Type = MCPS_CONFIRMED;
-            mcpsReq.Req.Confirmed.fPort = AppPort;
-            mcpsReq.Req.Confirmed.fBuffer = AppData;
-            mcpsReq.Req.Confirmed.fBufferSize = AppDataSize;
-            mcpsReq.Req.Confirmed.NbTrials = 8;
-            mcpsReq.Req.Confirmed.Datarate = LORAWAN_DEFAULT_DATARATE;
-        }
-    }
-
-    if( LoRaMacMcpsRequest( &mcpsReq ) == LORAMAC_STATUS_OK )
-    {
-        return false;
-    }
-    return true;
-}
-
-/*!
- * \brief Function executed on TxNextPacket Timeout event
- */
-static void OnTxNextPacketTimerEvent( void )
-{
-    MibRequestConfirm_t mibReq;
-    LoRaMacStatus_t status;
-
-    TimerStop( &TxNextPacketTimer );
-
-    mibReq.Type = MIB_NETWORK_JOINED;
-    status = LoRaMacMibGetRequestConfirm( &mibReq );
-
-    if( status == LORAMAC_STATUS_OK )
-    {
-        if( mibReq.Param.IsNetworkJoined == true )
-        {
-            DeviceState = DEVICE_STATE_SEND;
-            NextTx = true;
-        }
-        else
-        {
-            DeviceState = DEVICE_STATE_JOIN;
-        }
-    }
-}
-
-/*!
- * \brief Function executed on Led 1 Timeout event
- */
-static void OnLed1TimerEvent( void )
-{
-    TimerStop( &Led1Timer );
-    // Switch LED 1 OFF
-    Led1State = false;
-    Led1StateChanged = true;
+    return;
 }
 
-/*!
- * \brief Function executed on Led 2 Timeout event
- */
-static void OnLed2TimerEvent( void )
-{
-    TimerStop( &Led2Timer );
-    // Switch LED 2 OFF
-    Led2State = false;
-    Led2StateChanged = true;
-}
-
-/*!
- * \brief   MCPS-Confirm event function
- *
- * \param   [IN] mcpsConfirm - Pointer to the confirm structure,
- *               containing confirm attributes.
- */
-static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
+void McpsIndication( McpsIndication_t *mcpsIndication )
 {
-    if( mcpsConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
-    {
-        switch( mcpsConfirm->McpsRequest )
-        {
-            case MCPS_UNCONFIRMED:
-            {
-                // Check Datarate
-                // Check TxPower
-                break;
-            }
-            case MCPS_CONFIRMED:
-            {
-                // Check Datarate
-                // Check TxPower
-                // Check AckReceived
-                // Check NbTrials
-                LoRaMacUplinkStatus.Acked = mcpsConfirm->AckReceived;
-                break;
-            }
-            case MCPS_PROPRIETARY:
-            {
-                break;
-            }
-            default:
-                break;
-        }
-        LoRaMacUplinkStatus.Datarate = mcpsConfirm->Datarate;
-        LoRaMacUplinkStatus.UplinkCounter = mcpsConfirm->UpLinkCounter;
-
-        // Switch LED 1 ON
-        Led1State = true;
-        Led1StateChanged = true;
-        TimerStart( &Led1Timer );
-
-        UplinkStatusUpdated = true;
-    }
-    NextTx = true;
+    return;
 }
 
-/*!
- * \brief   MCPS-Indication event function
- *
- * \param   [IN] mcpsIndication - Pointer to the indication structure,
- *               containing indication attributes.
- */
-static void McpsIndication( McpsIndication_t *mcpsIndication )
-{
-    if( mcpsIndication->Status != LORAMAC_EVENT_INFO_STATUS_OK )
-    {
-        return;
-    }
 
-    switch( mcpsIndication->McpsIndication )
-    {
-        case MCPS_UNCONFIRMED:
-        {
-            break;
-        }
-        case MCPS_CONFIRMED:
-        {
-            break;
-        }
-        case MCPS_PROPRIETARY:
-        {
-            break;
-        }
-        case MCPS_MULTICAST:
-        {
-            break;
-        }
-        default:
-            break;
-    }
-
-    // Check Multicast
-    // Check Port
-    // Check Datarate
-    // Check FramePending
-    // Check Buffer
-    // Check BufferSize
-    // Check Rssi
-    // Check Snr
-    // Check RxSlot
-    LoRaMacDownlinkStatus.Rssi = mcpsIndication->Rssi;
-    if( mcpsIndication->Snr & 0x80 ) // The SNR sign bit is 1
-    {
-        // Invert and divide by 4
-        LoRaMacDownlinkStatus.Snr = ( ( ~mcpsIndication->Snr + 1 ) & 0xFF ) >> 2;
-        LoRaMacDownlinkStatus.Snr = -LoRaMacDownlinkStatus.Snr;
-    }
-    else
-    {
-        // Divide by 4
-        LoRaMacDownlinkStatus.Snr = ( mcpsIndication->Snr & 0xFF ) >> 2;
-    }
-    LoRaMacDownlinkStatus.DownlinkCounter++;
-    LoRaMacDownlinkStatus.RxData = mcpsIndication->RxData;
-    LoRaMacDownlinkStatus.Port = mcpsIndication->Port;
-    LoRaMacDownlinkStatus.Buffer = mcpsIndication->Buffer;
-    LoRaMacDownlinkStatus.BufferSize = mcpsIndication->BufferSize;
-
-    if( ComplianceTest.Running == true )
-    {
-        ComplianceTest.DownLinkCounter++;
-    }
-
-    if( mcpsIndication->RxData == true )
-    {
-        switch( mcpsIndication->Port )
-        {
-        case 1: // The application LED can be controlled on port 1 or 2
-        case 2:
-            if( mcpsIndication->BufferSize == 1 )
-            {
-                AppLedStateOn = mcpsIndication->Buffer[0] & 0x01;
-                Led3StateChanged = true;
-            }
-            break;
-        case 224:
-            if( ComplianceTest.Running == false )
-            {
-                // Check compliance test enable command (i)
-                if( ( mcpsIndication->BufferSize == 4 ) &&
-                    ( mcpsIndication->Buffer[0] == 0x01 ) &&
-                    ( mcpsIndication->Buffer[1] == 0x01 ) &&
-                    ( mcpsIndication->Buffer[2] == 0x01 ) &&
-                    ( mcpsIndication->Buffer[3] == 0x01 ) )
-                {
-                    IsTxConfirmed = false;
-                    AppPort = 224;
-                    AppDataSize = 2;
-                    ComplianceTest.DownLinkCounter = 0;
-                    ComplianceTest.LinkCheck = false;
-                    ComplianceTest.DemodMargin = 0;
-                    ComplianceTest.NbGateways = 0;
-                    ComplianceTest.Running = true;
-                    ComplianceTest.State = 1;
-
-                    MibRequestConfirm_t mibReq;
-                    mibReq.Type = MIB_ADR;
-                    mibReq.Param.AdrEnable = true;
-                    LoRaMacMibSetRequestConfirm( &mibReq );
-
-#if defined( USE_BAND_868 )
-                    LoRaMacTestSetDutyCycleOn( false );
-#endif
-                }
-            }
-            else
-            {
-                ComplianceTest.State = mcpsIndication->Buffer[0];
-                switch( ComplianceTest.State )
-                {
-                case 0: // Check compliance test disable command (ii)
-                    IsTxConfirmed = LORAWAN_CONFIRMED_MSG_ON;
-                    AppPort = LORAWAN_APP_PORT;
-                    AppDataSize = LORAWAN_APP_DATA_SIZE;
-                    ComplianceTest.DownLinkCounter = 0;
-                    ComplianceTest.Running = false;
 
-                    MibRequestConfirm_t mibReq;
-                    mibReq.Type = MIB_ADR;
-                    mibReq.Param.AdrEnable = LORAWAN_ADR_ON;
-                    LoRaMacMibSetRequestConfirm( &mibReq );
-#if defined( USE_BAND_868 )
-                    LoRaMacTestSetDutyCycleOn( LORAWAN_DUTYCYCLE_ON );
-#endif
-                    break;
-                case 1: // (iii, iv)
-                    AppDataSize = 2;
-                    break;
-                case 2: // Enable confirmed messages (v)
-                    IsTxConfirmed = true;
-                    ComplianceTest.State = 1;
-                    break;
-                case 3:  // Disable confirmed messages (vi)
-                    IsTxConfirmed = false;
-                    ComplianceTest.State = 1;
-                    break;
-                case 4: // (vii)
-                    AppDataSize = mcpsIndication->BufferSize;
-
-                    AppData[0] = 4;
-                    for( uint8_t i = 1; i < AppDataSize; i++ )
-                    {
-                        AppData[i] = mcpsIndication->Buffer[i] + 1;
-                    }
-                    break;
-                case 5: // (viii)
-                    {
-                        MlmeReq_t mlmeReq;
-                        mlmeReq.Type = MLME_LINK_CHECK;
-                        LoRaMacMlmeRequest( &mlmeReq );
-                    }
-                    break;
-                case 6: // (ix)
-                    {
-                        MlmeReq_t mlmeReq;
-
-                        // Disable TestMode and revert back to normal operation
-                        IsTxConfirmed = LORAWAN_CONFIRMED_MSG_ON;
-                        AppPort = LORAWAN_APP_PORT;
-                        AppDataSize = LORAWAN_APP_DATA_SIZE;
-                        ComplianceTest.DownLinkCounter = 0;
-                        ComplianceTest.Running = false;
-
-                        MibRequestConfirm_t mibReq;
-                        mibReq.Type = MIB_ADR;
-                        mibReq.Param.AdrEnable = LORAWAN_ADR_ON;
-                        LoRaMacMibSetRequestConfirm( &mibReq );
-#if defined( USE_BAND_868 )
-                        LoRaMacTestSetDutyCycleOn( LORAWAN_DUTYCYCLE_ON );
-#endif
-
-                        mlmeReq.Type = MLME_JOIN;
-
-                        mlmeReq.Req.Join.DevEui = DevEui;
-                        mlmeReq.Req.Join.AppEui = AppEui;
-                        mlmeReq.Req.Join.AppKey = AppKey;
-                        mlmeReq.Req.Join.NbTrials = 3;
-
-                        LoRaMacMlmeRequest( &mlmeReq );
-                        DeviceState = DEVICE_STATE_SLEEP;
-                    }
-                    break;
-                case 7: // (x)
-                    {
-                        if( mcpsIndication->BufferSize == 3 )
-                        {
-                            MlmeReq_t mlmeReq;
-                            mlmeReq.Type = MLME_TXCW;
-                            mlmeReq.Req.TxCw.Timeout = ( uint16_t )( ( mcpsIndication->Buffer[1] << 8 ) | mcpsIndication->Buffer[2] );
-                            LoRaMacMlmeRequest( &mlmeReq );
-                        }
-                        else if( mcpsIndication->BufferSize == 7 )
-                        {
-                            MlmeReq_t mlmeReq;
-                            mlmeReq.Type = MLME_TXCW_1;
-                            mlmeReq.Req.TxCw.Timeout = ( uint16_t )( ( mcpsIndication->Buffer[1] << 8 ) | mcpsIndication->Buffer[2] );
-                            mlmeReq.Req.TxCw.Frequency = ( uint32_t )( ( mcpsIndication->Buffer[3] << 16 ) | ( mcpsIndication->Buffer[4] << 8 ) | mcpsIndication->Buffer[5] ) * 100;
-                            mlmeReq.Req.TxCw.Power = mcpsIndication->Buffer[6];
-                            LoRaMacMlmeRequest( &mlmeReq );
-                        }
-                        ComplianceTest.State = 1;
-                    }
-                    break;
-                default:
-                    break;
-                }
-            }
-            break;
-        default:
-            break;
-        }
-    }
-
-    // Switch LED 2 ON for each received downlink
-    Led2State = true;
-    Led2StateChanged = true;
-    TimerStart( &Led2Timer );
-    DownlinkStatusUpdated = true;
-}
-
-/*!
- * \brief   MLME-Confirm event function
- *
- * \param   [IN] mlmeConfirm - Pointer to the confirm structure,
- *               containing confirm attributes.
- */
-static void MlmeConfirm( MlmeConfirm_t *mlmeConfirm )
-{
-    switch( mlmeConfirm->MlmeRequest )
-    {
-        case MLME_JOIN:
-        {
-            if( mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
-            {
-                // Status is OK, node has joined the network
-                IsNetworkJoinedStatusUpdate = true;
-                DeviceState = DEVICE_STATE_SEND;
-            }
-            else
-            {
-                // Join was not successful. Try to join again
-                DeviceState = DEVICE_STATE_JOIN;
-            }
-            break;
-        }
-        case MLME_LINK_CHECK:
-        {
-            if( mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
-            {
-                // Check DemodMargin
-                // Check NbGateways
-                if( ComplianceTest.Running == true )
-                {
-                    ComplianceTest.LinkCheck = true;
-                    ComplianceTest.DemodMargin = mlmeConfirm->DemodMargin;
-                    ComplianceTest.NbGateways = mlmeConfirm->NbGateways;
-                }
-            }
-            break;
-        }
-        default:
-            break;
-    }
-    NextTx = true;
-    UplinkStatusUpdated = true;
-}
-
-/**
- * Main application entry point.
- */
+ 
 int main( void )
 {
+    //Initialise firmware
+        
     LoRaMacPrimitives_t LoRaMacPrimitives;
     LoRaMacCallback_t LoRaMacCallbacks;
     MibRequestConfirm_t mibReq;
 
-    BoardInit( );
-    SerialDisplayInit( );
-
-    SerialDisplayUpdateEui( 5, DevEui );
-    SerialDisplayUpdateEui( 6, AppEui );
-    SerialDisplayUpdateKey( 7, AppKey );
+    LoRaMacPrimitives.MacMcpsConfirm = McpsConfirm;
+    LoRaMacPrimitives.MacMcpsIndication = McpsIndication;
+//    LoRaMacPrimitives.MacMlmeConfirm = McpsConfirm;
+    LoRaMacInitialization( &LoRaMacPrimitives, &LoRaMacCallbacks );
 
-#if( OVER_THE_AIR_ACTIVATION == 0 )
-    SerialDisplayUpdateNwkId( LORAWAN_NETWORK_ID );
-    SerialDisplayUpdateDevAddr( DevAddr );
-    SerialDisplayUpdateKey( 12, NwkSKey );
-    SerialDisplayUpdateKey( 13, AppSKey );
-#endif
+    LoRaMacChannelAdd( 3, ( ChannelParams_t ){ 867100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 } );
+    LoRaMacChannelAdd( 4, ( ChannelParams_t ){ 867300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 });
+    LoRaMacChannelAdd( 5, ( ChannelParams_t ){ 867500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 } );
+    LoRaMacChannelAdd( 6, ( ChannelParams_t ){ 867700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 } );
+    LoRaMacChannelAdd( 7, ( ChannelParams_t ){ 867900000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 } );
+    LoRaMacChannelAdd( 8, ( ChannelParams_t ){ 868800000, { ( ( DR_7 << 4 ) | DR_7 ) }, 2 } );
+    LoRaMacChannelAdd( 9, ( ChannelParams_t ){ 868300000, { ( ( DR_6 << 4 ) | DR_6 ) }, 1 } );
 
-    DeviceState = DEVICE_STATE_INIT;
+    //Join ABP
 
-    while( 1 )
-    {
-        SerialRxProcess( );
-        if( IsNetworkJoinedStatusUpdate == true )
-        {
-            IsNetworkJoinedStatusUpdate = false;
-            mibReq.Type = MIB_NETWORK_JOINED;
-            LoRaMacMibGetRequestConfirm( &mibReq );
-            SerialDisplayUpdateNetworkIsJoined( mibReq.Param.IsNetworkJoined );
-        }
-        if( Led1StateChanged == true )
-        {
-            Led1StateChanged = false;
-            SerialDisplayUpdateLedState( 1, Led1State );
-        }
-        if( Led2StateChanged == true )
-        {
-            Led2StateChanged = false;
-            SerialDisplayUpdateLedState( 2, Led2State );
-        }
-        if( Led3StateChanged == true )
-        {
-            Led3StateChanged = false;
-            SerialDisplayUpdateLedState( 3, AppLedStateOn );
-        }
-        if( UplinkStatusUpdated == true )
-        {
-            UplinkStatusUpdated = false;
-            SerialDisplayUpdateUplink( LoRaMacUplinkStatus.Acked, LoRaMacUplinkStatus.Datarate, LoRaMacUplinkStatus.UplinkCounter, LoRaMacUplinkStatus.Port, LoRaMacUplinkStatus.Buffer, LoRaMacUplinkStatus.BufferSize );
-        }
-        if( DownlinkStatusUpdated == true )
-        {
-            DownlinkStatusUpdated = false;
-            SerialDisplayUpdateLedState( 2, Led2State );
-            SerialDisplayUpdateDownlink( LoRaMacDownlinkStatus.RxData, LoRaMacDownlinkStatus.Rssi, LoRaMacDownlinkStatus.Snr, LoRaMacDownlinkStatus.DownlinkCounter, LoRaMacDownlinkStatus.Port, LoRaMacDownlinkStatus.Buffer, LoRaMacDownlinkStatus.BufferSize );
-        }
-        
-        switch( DeviceState )
-        {
-            case DEVICE_STATE_INIT:
-            {
-                LoRaMacPrimitives.MacMcpsConfirm = McpsConfirm;
-                LoRaMacPrimitives.MacMcpsIndication = McpsIndication;
-                LoRaMacPrimitives.MacMlmeConfirm = MlmeConfirm;
-                LoRaMacCallbacks.GetBatteryLevel = BoardGetBatteryLevel;
-                LoRaMacInitialization( &LoRaMacPrimitives, &LoRaMacCallbacks );
+    mibReq.Type = MIB_NET_ID;
+    mibReq.Param.NetID = 0;
+    LoRaMacMibSetRequestConfirm( &mibReq );
+
+    mibReq.Type = MIB_DEV_ADDR;
+    mibReq.Param.DevAddr = LORAWAN_DEVICE_ADDRESS;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-                TimerInit( &TxNextPacketTimer, OnTxNextPacketTimerEvent );
-
-                TimerInit( &Led1Timer, OnLed1TimerEvent );
-                TimerSetValue( &Led1Timer, 25 );
-
-                TimerInit( &Led2Timer, OnLed2TimerEvent );
-                TimerSetValue( &Led2Timer, 25 );
-
-                mibReq.Type = MIB_ADR;
-                mibReq.Param.AdrEnable = LORAWAN_ADR_ON;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
-                mibReq.Type = MIB_PUBLIC_NETWORK;
-                mibReq.Param.EnablePublicNetwork = LORAWAN_PUBLIC_NETWORK;
-                LoRaMacMibSetRequestConfirm( &mibReq );
+    mibReq.Type = MIB_NWK_SKEY;
+    mibReq.Param.NwkSKey = NwkSKey;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-#if defined( USE_BAND_868 )
-                LoRaMacTestSetDutyCycleOn( LORAWAN_DUTYCYCLE_ON );
-                SerialDisplayUpdateDutyCycle( LORAWAN_DUTYCYCLE_ON );
-
-#if( USE_SEMTECH_DEFAULT_CHANNEL_LINEUP == 1 )
-                LoRaMacChannelAdd( 3, ( ChannelParams_t )LC4 );
-                LoRaMacChannelAdd( 4, ( ChannelParams_t )LC5 );
-                LoRaMacChannelAdd( 5, ( ChannelParams_t )LC6 );
-                LoRaMacChannelAdd( 6, ( ChannelParams_t )LC7 );
-                LoRaMacChannelAdd( 7, ( ChannelParams_t )LC8 );
-                LoRaMacChannelAdd( 8, ( ChannelParams_t )LC9 );
-                LoRaMacChannelAdd( 9, ( ChannelParams_t )LC10 );
-
-                mibReq.Type = MIB_RX2_DEFAULT_CHANNEL;
-                mibReq.Param.Rx2DefaultChannel = ( Rx2ChannelParams_t ){ 869525000, DR_3 };
-                LoRaMacMibSetRequestConfirm( &mibReq );
+    mibReq.Type = MIB_APP_SKEY;
+    mibReq.Param.AppSKey = AppSKey;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mibReq.Type = MIB_RX2_CHANNEL;
-                mibReq.Param.Rx2Channel = ( Rx2ChannelParams_t ){ 869525000, DR_3 };
-                LoRaMacMibSetRequestConfirm( &mibReq );
-#endif
-
-#endif
-                SerialDisplayUpdateActivationMode( OVER_THE_AIR_ACTIVATION );
-                SerialDisplayUpdateAdr( LORAWAN_ADR_ON );
-                SerialDisplayUpdatePublicNetwork( LORAWAN_PUBLIC_NETWORK );
-
-                LoRaMacDownlinkStatus.DownlinkCounter = 0;
-
-                DeviceState = DEVICE_STATE_JOIN;
-                break;
-            }
-            case DEVICE_STATE_JOIN:
-            {
-#if( OVER_THE_AIR_ACTIVATION != 0 )
-                MlmeReq_t mlmeReq;
-
-                mlmeReq.Type = MLME_JOIN;
+    mibReq.Type = MIB_NETWORK_JOINED;
+    mibReq.Param.IsNetworkJoined = true;
+    LoRaMacMibSetRequestConfirm( &mibReq );
+    
+    mibReq.Type = MIB_CHANNELS_TX_POWER;
+    mibReq.Param.ChannelsTxPower = LORAMAC_MAX_TX_POWER;
+    LoRaMacMibSetRequestConfirm( &mibReq );
+    
+    mibReq.Type = MIB_CHANNELS_DEFAULT_TX_POWER;
+    mibReq.Param.ChannelsDefaultTxPower = LORAMAC_MAX_TX_POWER;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-                mlmeReq.Req.Join.DevEui = DevEui;
-                mlmeReq.Req.Join.AppEui = AppEui;
-                mlmeReq.Req.Join.AppKey = AppKey;
-
-                if( NextTx == true )
-                {
-                    LoRaMacMlmeRequest( &mlmeReq );
-                }
-                DeviceState = DEVICE_STATE_SLEEP;
-#else
-                mibReq.Type = MIB_NET_ID;
-                mibReq.Param.NetID = LORAWAN_NETWORK_ID;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
-                mibReq.Type = MIB_DEV_ADDR;
-                mibReq.Param.DevAddr = DevAddr;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
-                mibReq.Type = MIB_NWK_SKEY;
-                mibReq.Param.NwkSKey = NwkSKey;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
-                mibReq.Type = MIB_APP_SKEY;
-                mibReq.Param.AppSKey = AppSKey;
-                LoRaMacMibSetRequestConfirm( &mibReq );
+    //Prepareframe
 
-                mibReq.Type = MIB_NETWORK_JOINED;
-                mibReq.Param.IsNetworkJoined = true;
-                LoRaMacMibSetRequestConfirm( &mibReq );
-
-                DeviceState = DEVICE_STATE_SEND;
-#endif
-                IsNetworkJoinedStatusUpdate = true;
-                break;
-            }
-            case DEVICE_STATE_SEND:
-            {
-                if( NextTx == true )
-                {
-                    SerialDisplayUpdateUplinkAcked( false );
-                    SerialDisplayUpdateDonwlinkRxData( false );
-                    PrepareTxFrame( AppPort );
+    AppData[0] = 0xFF;
+    AppData[1] = 0xFF;
+    AppData[2] = 0xFF;
+    AppData[3] = 0xFF;
+    
+    //Sendframe
+    
+    McpsReq_t mcpsReq;
+    
+    uint8_t AppPort = 3;
+    mcpsReq.Type = MCPS_CONFIRMED;
+    mcpsReq.Req.Confirmed.fPort = AppPort;
+    mcpsReq.Req.Confirmed.fBuffer = AppData;
+    mcpsReq.Req.Confirmed.fBufferSize = APPDATA_SIZE;
+    mcpsReq.Req.Confirmed.Datarate = LORAWAN_DEFAULT_DATARATE;
+        
+    LoRaMacMcpsRequest( &mcpsReq );
+    
+    while(1);
+}
 
-                    NextTx = SendFrame( );
-                }
-                if( ComplianceTest.Running == true )
-                {
-                    // Schedule next packet transmission
-                    TxDutyCycleTime = 5000; // 5000 ms
-                }
-                else
-                {
-                    // Schedule next packet transmission
-                    TxDutyCycleTime = APP_TX_DUTYCYCLE + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND );
-                }
-                DeviceState = DEVICE_STATE_CYCLE;
-                break;
-            }
-            case DEVICE_STATE_CYCLE:
-            {
-                DeviceState = DEVICE_STATE_SLEEP;
-
-                // Schedule next packet transmission
-                TimerSetValue( &TxNextPacketTimer, TxDutyCycleTime );
-                TimerStart( &TxNextPacketTimer );
-                break;
-            }
-            case DEVICE_STATE_SLEEP:
-            {
-                // Wake up through events
-                break;
-            }
-            default:
-            {
-                DeviceState = DEVICE_STATE_INIT;
-                break;
-            }
-        }
-    }
-}
diff -r ee9dcbb9708d -r 9364ab3a08eb app/vt100.h
--- a/app/vt100.h	Mon Apr 24 13:38:31 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/*
- / _____)             _              | |
-( (____  _____ ____ _| |_ _____  ____| |__
- \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- _____) ) ____| | | || |_| ____( (___| | | |
-(______/|_____)_|_|_| \__)_____)\____)_| |_|
-    (C)2015 Semtech
-
-Description: VT100 terminal support class
-
-License: Revised BSD License, see LICENSE.TXT file include in the project
-
-Maintainer: Miguel Luis and Gregory Cristian
-*/
-#ifndef __VT100_H__
-#define __VT100_H__
-
-#ifndef STRING_STACK_LIMIT
-#define STRING_STACK_LIMIT    120
-#endif
-
-/**
- * Implements VT100 terminal commands support.
- * Implments also the same behaviour has RawSerial class. The only difference
- * is located in putc fucntion where writeable check is made befor sending the character.
- */
-class VT100 : public SerialBase
-{
-public:
-    enum TextAttributes
-    {
-        ATTR_OFF      = 0,
-        BOLD          = 1,
-        USCORE        = 4,
-        BLINK         = 5,
-        REVERSE       = 7,
-        BOLD_OFF      = 21,
-        USCORE_OFF    = 24,
-        BLINK_OFF     = 25,
-        REVERSE_OFF   = 27,
-    };
-
-    enum Colors
-    {
-        BLACK   = 0,
-        RED     = 1,
-        GREEN   = 2,
-        BROWN   = 3,
-        BLUE    = 4,
-        MAGENTA = 5,
-        CYAN    = 6,
-        WHITE   = 7,
-    };
-
-    VT100( PinName tx, PinName rx ): SerialBase( tx, rx, 115200 )
-    {
-        // initializes terminal to "power-on" settings
-        // ESC c
-        this->printf( "\x1B\x63" );
-    }
-    
-    void ClearScreen( uint8_t param )
-    {
-        // ESC [ Ps J
-        // 0    Clear screen from cursor down
-        // 1    Clear screen from cursor up
-        // 2    Clear entire screen 
-        this->printf( "\x1B[%dJ", param );
-    }
-
-    void ClearLine( uint8_t param )
-    {
-        // ESC [ Ps K
-        // 0    Erase from the active position to the end of the line, inclusive (default)
-        // 1    Erase from the start of the screen to the active position, inclusive
-        // 2    Erase all of the line, inclusive
-        this->printf( "\x1B[%dK", param );
-    }
-
-    void SetAttribute( uint8_t attr )
-    {
-        // ESC [ Ps;...;Ps m
-        this->printf( "\x1B[%dm", attr );
-    }
-
-    void SetAttribute( uint8_t attr, uint8_t fgcolor, uint8_t bgcolor )
-    {
-        // ESC [ Ps;...;Ps m
-        this->printf( "\x1B[%d;%d;%dm", attr, fgcolor + 30, bgcolor + 40 );
-    }
-
-    void SetCursorMode( uint8_t visible )
-    {
-        if( visible == true )
-        {
-            // ESC [ ? 25 h
-            this->printf( "\x1B[?25h" );
-        }
-        else
-        {
-            // ESC [ ? 25 l
-            this->printf( "\x1B[?25l" );
-        }
-    }
-
-    void SetCursorPos( uint8_t line, uint8_t col )
-    {
-        // ESC [ Pl ; Pc H
-        this->printf( "\x1B[%d;%dH", line, col );
-    }
-
-    void PutStringAt( uint8_t line, uint8_t col, const char *s )
-    {
-        this->SetCursorPos( line, col );
-        this->printf( "%s", s );
-    }
-
-    void PutCharAt( uint8_t line, uint8_t col, uint8_t c )
-    {
-        this->SetCursorPos( line, col );
-        this->printf( "%c", c );
-    }
-
-    void PutHexAt( uint8_t line, uint8_t col, uint16_t n )
-    {
-        this->SetCursorPos( line, col );
-        this->printf( "%X", n );
-    }
-
-    void PutBoxDrawingChar( uint8_t c )
-    {
-        this->printf( "\x1B(0%c\x1b(B", c );
-    }
-    
-    bool Readable( void )
-    {
-        return this->readable( );
-    }
-    
-    uint8_t GetChar( void )
-    {
-        return this->getc( );
-    }
-
-    /*
-     * RawSerial class implmentation copy.
-     */
-    /** Read a char from the serial port
-     *
-     * @returns The char read from the serial port
-     */
-    int getc( )
-    {
-        return _base_getc( );
-    }
-
-    /** Write a char to the serial port
-     *
-     * @param c The char to write
-     *
-     * @returns The written char or -1 if an error occured
-     */
-    int putc( int c )
-    {
-        while( this->writeable( ) != 1 );
-        return _base_putc( c );
-    }
-
-    /** Write a string to the serial port
-     *
-     * @param str The string to write
-     *
-     * @returns 0 if the write succeeds, EOF for error
-     */
-    int puts( const char *str )
-    {
-        while( *str )
-            putc( *str++ );
-        return 0;
-    }
-
-    // Experimental support for printf in RawSerial. No Stream inheritance
-    // means we can't call printf() directly, so we use sprintf() instead.
-    // We only call malloc() for the sprintf() buffer if the buffer
-    // length is above a certain threshold, otherwise we use just the stack.
-    int printf( const char *format, ... )
-    {
-        std::va_list arg;
-        va_start( arg, format );
-        int len = vsnprintf( NULL, 0, format, arg );
-        if( len < STRING_STACK_LIMIT )
-        {
-            char temp[STRING_STACK_LIMIT];
-            vsprintf( temp, format, arg );
-            puts( temp );
-        }
-        else
-        {
-            char *temp = new char[len + 1];
-            vsprintf( temp, format, arg );
-            puts( temp );
-            delete[] temp;
-        }
-        va_end( arg );
-        return len;
-    }
-
-private:
-    
-};
-
-#endif // __VT100_H__