DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main.cpp: code sanitization

Browse Source
This commit is contained in:
Klaus K Wilting 2018-04-19 11:07:18 +02:00
parent 7f7dfaeec8
commit f922b90242
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main.cpp
View File

@ -72,11 +72,32 @@ int redirect_log(const char * fmt, va_list args) {
} }
#endif #endif
//--- Prototypes ---
// LMIC functions, defined in this main.cpp
void onEvent(ev_t ev);
void do_send(osjob_t* j);
// defined in configmanager.cpp // defined in configmanager.cpp
void eraseConfig(void); void eraseConfig(void);
void saveConfig(void); void saveConfig(void);
void loadConfig(void); void loadConfig(void);
// defined in lorawan.cpp
void gen_lora_deveui(uint8_t * pdeveui);
void RevBytes(unsigned char* b, size_t c);
void get_hard_deveui(uint8_t *pdeveui);
// defined in wifisniffer.cpp
void wifi_sniffer_init(void);
void wifi_sniffer_set_channel(uint8_t channel);
void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type);
// defined in blescan.cpp
void bt_loop(void *ignore);
//---
void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) { void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) {
color = set_color; // set color for RGB LED color = set_color; // set color for RGB LED
LEDBlinkduration = set_blinkduration; // duration on LEDBlinkduration = set_blinkduration; // duration on
@ -87,10 +108,6 @@ void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_inter
/* begin LMIC specific parts ------------------------------------------------------------ */ /* begin LMIC specific parts ------------------------------------------------------------ */
// defined in lorawan.cpp
void gen_lora_deveui(uint8_t * pdeveui);
void RevBytes(unsigned char* b, size_t c);
void get_hard_deveui(uint8_t *pdeveui);
#ifdef VERBOSE #ifdef VERBOSE
void printKeys(void); void printKeys(void);
@ -136,10 +153,6 @@ const lmic_pinmap lmic_pins = {
.dio = {DIO0, DIO1, DIO2} .dio = {DIO0, DIO1, DIO2}
}; };
// LMIC functions
void onEvent(ev_t ev);
void do_send(osjob_t* j);
// LoRaWAN Initjob // LoRaWAN Initjob
static void lora_init (osjob_t* j) { static void lora_init (osjob_t* j) {
// reset MAC state // reset MAC state
@ -212,14 +225,6 @@ void lorawan_loop(void * pvParameters) {
/* begin wifi specific parts ---------------------------------------------------------- */ /* begin wifi specific parts ---------------------------------------------------------- */
// defined in wifisniffer.cpp
void wifi_sniffer_init(void);
void wifi_sniffer_set_channel(uint8_t channel);
void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type);
// defined in blescan.cpp
void bt_loop(void *ignore);
// Sniffer Task // Sniffer Task
void sniffer_loop(void * pvParameters) { void sniffer_loop(void * pvParameters) {