Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development

include/lorawan.h

@@ -31,8 +31,8 @@ typedef struct {
 } mac_t;
 
 esp_err_t lora_stack_init();
+void lora_setupForNetwork(bool preJoin);
 void lmictask(void *pvParameters);
-void onEvent(ev_t ev);
 void gen_lora_deveui(uint8_t *pdeveui);
 void RevBytes(unsigned char *b, size_t c);
 void get_hard_deveui(uint8_t *pdeveui);
@@ -43,6 +43,7 @@ void showLoraKeys(void);
 void lora_send(void *pvParameters);
 void lora_enqueuedata(MessageBuffer_t *message);
 void lora_queuereset(void);
+void myEventCallback(void *pUserData, ev_t ev);
 void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg,
                   size_t nMsg);
 void myTxCallback(void *pUserData, int fSuccess);