Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixe complier warnings and missing AT return states #35

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
39724ec
ATSlave at standard return parse at_NetworkJoinStatus
flhofer Apr 27, 2021
eb2a494
ATSlave: Add missing function declarations Lora.h
flhofer Apr 27, 2021
1d8afac
Driver/BSP Sx1276 add missing Reset function declaration
flhofer Apr 27, 2021
dcf1372
AT-slave main add missing includes phy chip/radio for reset p-through
flhofer Apr 27, 2021
d246fb1
ATSlave added missing +OK= prints to *_get calls
flhofer Apr 27, 2021
aa2b4df
Update version info 1.2.4
flhofer Apr 28, 2021
f440556
ATSlave change to respond with +<CMD>=<VALUE> for getters on success
flhofer Apr 29, 2021
c144917
ATSlave add constant definition AT_EVENT
flhofer May 2, 2021
e88b29a
ATSlave vcom fixed unwanted human readable string in AT output
flhofer May 2, 2021
b3f2e72
ATSlave at.c fix parameter read for TransmitPower_set
flhofer May 2, 2021
ab564f7
ATSlave at.c add check for correctness Networkid and devaddr set
flhofer May 2, 2021
582875d
Add command +MSIZE for the detection of max payload size
flhofer Jun 11, 2021
3e12a24
ATSlave at/lora Upgrade buffers to allow 242/121 bytes send (binary)
flhofer Jun 11, 2021
1e42dec
ATSlave lora.c to use last set data rate for non ADR tx (was Init = DR0)
flhofer Jun 19, 2021
0f278fe
Remove +ACK print in the sx1276 driver
flhofer Jun 21, 2021
9f76e9e
Update readme
flhofer Jun 21, 2021
f849548
ATSlave Fix at_DataRate_set check for ADR inverted
flhofer Jun 21, 2021
22e5844
ATSlave Fix at_DataRate_set patch sequence Init/Default/Channel DataRate
flhofer Jun 22, 2021
fcbf15e
ATSlave fix uninitialized port for MAC filler frame
flhofer Jun 22, 2021
64a8bfa
ATSlave Lora lora_send fix app-port set with invalid string AT_SEND
flhofer Jun 22, 2021
8805bf3
ATSlave at.c print frequency fix unsigned
flhofer Jul 10, 2021
72da24f
ATSlave AT upgrade to 242bytes binary send, HEX cut-off to 242
flhofer Jul 25, 2021
da2917c
AT_Slave at merged sendV2/confirmed and added check for AT_ERROR_RX_CHAR
flhofer Aug 24, 2021
8a23f4e
Update README.md
flhofer Dec 5, 2021
6e67bfc
Update README.md
flhofer Dec 5, 2021
f0cb13e
ATSlave: add carriage return `\r` after reboot with `+EVENT=0,0`
flhofer Dec 5, 2021
e49d8e0
Merge branch 'fix-hup1.2.3' of [email protected]:flhofer/mkrwan1300-fw.g…
flhofer Dec 5, 2021
8a3d923
Update README.md
flhofer Mar 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Drivers/BSP/Components/sx1276/sx1276.c
Original file line number Diff line number Diff line change
Expand Up @@ -1644,8 +1644,6 @@ void SX1276OnDio0Irq( void )
if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )
{
RadioEvents->RxDone( RxTxBuffer, SX1276.Settings.LoRaPacketHandler.Size, SX1276.Settings.LoRaPacketHandler.RssiValue, SX1276.Settings.LoRaPacketHandler.SnrValue );
PRINTF( "+ACK\r" );
//PRINTF("+RECV=");
}
}
break;
Expand Down
6 changes: 6 additions & 0 deletions Drivers/BSP/Components/sx1276/sx1276.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Maintainer: Miguel Luis and Gregory Cristian

#include "sx1276Regs-Fsk.h"
#include "sx1276Regs-LoRa.h"
#include "radio.h"

/*!
* Radio wake-up time from sleep
Expand Down Expand Up @@ -271,6 +272,11 @@ void SX1276BoardInit( LoRaBoardCallback_t *callbacks );
*/
uint32_t SX1276Init( RadioEvents_t *events );

/*!
* \brief Resets the SX1276
*/
void SX1276Reset( void );

/*!
* \brief Sets the SX1276 operating mode
*
Expand Down
11 changes: 11 additions & 0 deletions Projects/Multi/Applications/LoRa/AT_Slave/inc/at.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ typedef enum eATEerror
#define AT_CERTIF "+CERTIF"
#define AT_CHANMASK "+CHANMASK"
#define AT_CHANDEFMASK "+CHANDEFMASK"
#define AT_MSIZE "+MSIZE"

#define AT_EVENT "+EVENT"
#define AT_EQ "="

/* Exported functions ------------------------------------------------------- */

Expand Down Expand Up @@ -702,6 +706,13 @@ ATEerror_t at_ChannelDefaultMask_get(const char *param);
*/
ATEerror_t at_ChannelDefaultMask_set(const char *param);

/**
* @brief Gets the current maximum send and receive buffer size
* @param String parameter
* @retval AT_OK, or an appropriate AT_xxx error code
*/
ATEerror_t at_MaxSize_get(const char *param);

#ifdef __cplusplus
}
#endif
Expand Down
80 changes: 79 additions & 1 deletion Projects/Multi/Applications/LoRa/AT_Slave/inc/lora.h
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,66 @@ uint8_t *lora_config_appeui_get(void);
/**
* @brief Set Application EUI
* @param AppEUI
* @retval Nonoe
* @retval None
*/
void lora_config_appeui_set(uint8_t appeui[8]);

/**
* @brief Get device address
* @param None
* @retval DevAddr
*/
uint32_t lora_config_devaddr_get(void);

/**
* @brief Set device address
* @param DevAddr
* @retval None
*/
void lora_config_devaddr_set(uint32_t devaddr);

/**
* @brief Set network id
* @param NetId
* @retval None
*/
void lora_config_networkid_set(uint32_t networkid);

/**
* @brief Get network id
* @param None
* @retval NetId
*/
uint32_t lora_config_networkid_get(void);

/**
* @brief Get network session key
* @param None
* @retval NwkSKey
*/
uint8_t *lora_config_nwkskey_get(void);

/**
* @brief Set network session key
* @param NwkSKey
* @retval None
*/
void lora_config_nwkskey_set(uint8_t nwkSKey[16]);

/**
* @brief Get application session key
* @param None
* @retval AppSKey
*/
uint8_t *lora_config_appskey_get(void);

/**
* @brief Set application session key
* @param AppSKey
* @retval None
*/
void lora_config_appskey_set(uint8_t appskey[16]);

/**
* @brief Get Application Key
* @param None
Expand Down Expand Up @@ -400,6 +456,28 @@ void lora_config_application_port_set(uint8_t application_port);
*/
uint8_t lora_config_application_port_get(void);

/**
* @brief Get the maximum payload size for tx/rx
* @param None
* @retval Maximum size in bytes (<255)
*/
uint8_t lora_config_max_size_get(void);


/**
* @brief Get the data rate for non-ADR send
* @param None
* @retval Maximum size in bytes (<255)
*/
int8_t lora_config_data_rate_get(void);

/**
* @brief Set the data rate for non-ADR send
* @param The data rate to set
* @retval None
*/
void lora_config_data_rate_set(int8_t data_rate);

/**
* @brief Launch LoraWan certification tests
* @param None
Expand Down
2 changes: 1 addition & 1 deletion Projects/Multi/Applications/LoRa/AT_Slave/inc/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extern "C" {
#define TEST_VERSION (uint32_t) 0x00000000 /*1 lsb is always 0 in releases */
#define LRWAN_VERSION (uint32_t) 0x00001120 /*3 next hex is i_cube release*/
#define VERSION (uint32_t) (LORA_MAC_VERSION | LRWAN_VERSION | TEST_VERSION)
#define AT_VERSION_STRING "1.2.3"
#define AT_VERSION_STRING "1.2.4"
#define AT_DEVICE_STRING "ARD-078"

/* Exported types ------------------------------------------------------------*/
Expand Down
Loading