diff --git a/firmware/applications/final.c b/firmware/applications/final.c index 9ffd509..eb6d32e 100644 --- a/firmware/applications/final.c +++ b/firmware/applications/final.c @@ -9,6 +9,7 @@ #include "basic/ecc.h" #include "basic/config.h" +#include "filesystem/execute.h" /**************************************************************************/ diff --git a/firmware/applications/final/beacon.c b/firmware/applications/final/beacon.c index 53cb977..d4292ea 100644 --- a/firmware/applications/final/beacon.c +++ b/firmware/applications/final/beacon.c @@ -3,6 +3,7 @@ #include "basic/basic.h" #include "basic/byteorder.h" #include "basic/config.h" +#include "basic/random.h" #include "funk/nrf24l01p.h" #include "funk/openbeacon.h" diff --git a/firmware/applications/final/flame.c b/firmware/applications/final/flame.c index 1b5f5fa..6359137 100644 --- a/firmware/applications/final/flame.c +++ b/firmware/applications/final/flame.c @@ -154,6 +154,7 @@ void init_flame(void) { #include "lcd/print.h" +// //# MENU flame void ChkFlame(void) { do{ lcdClear(); diff --git a/firmware/applications/final/nickname.c b/firmware/applications/final/nickname.c index 2882293..a6288ea 100644 --- a/firmware/applications/final/nickname.c +++ b/firmware/applications/final/nickname.c @@ -11,6 +11,7 @@ #include "filesystem/ff.h" #include "filesystem/select.h" +#include "filesystem/execute.h" #include diff --git a/firmware/basic/idle.c b/firmware/basic/idle.c index 9682675..838ddd5 100644 --- a/firmware/basic/idle.c +++ b/firmware/basic/idle.c @@ -42,10 +42,11 @@ uint8_t work_queue_minimal(void){ return 1; }; }; + /* NOTREACHED */ + return 0; }; void work_queue(void){ - int start; if (the_queue.qstart == the_queue.qend){ WFI; @@ -57,7 +58,7 @@ void work_queue(void){ uint8_t delayms_queue_plus(uint32_t ms, uint8_t final){ - int ret; + int ret=0; int end=_timectr+ms/SYSTICKSPEED; do { if (the_queue.qstart == the_queue.qend){ diff --git a/firmware/filesystem/ff.h b/firmware/filesystem/ff.h index 611a703..2685387 100644 --- a/firmware/filesystem/ff.h +++ b/firmware/filesystem/ff.h @@ -334,6 +334,7 @@ const char* f_get_rc_string (FRESULT rc); void fsInit(); int readFile(char * filename, char * data, int len); int writeFile(char * filename, char * data, int len); +void fsReInit(); #ifdef __cplusplus } diff --git a/firmware/funk/nrf24l01p.c b/firmware/funk/nrf24l01p.c index 56c6b63..db1460a 100644 --- a/firmware/funk/nrf24l01p.c +++ b/firmware/funk/nrf24l01p.c @@ -405,11 +405,10 @@ void nrf_off() { }; -uint8_t nrf_check_reset(void){ +void nrf_check_reset(void){ static uint8_t _nrfresets=0; if(nrf_cmd_status(C_NOP) & R_STATUS_MAX_RT){ _nrfresets++; nrf_init(); }; - return _nrfresets; }; diff --git a/firmware/funk/nrf24l01p.h b/firmware/funk/nrf24l01p.h index 67d69d8..42f6e3f 100644 --- a/firmware/funk/nrf24l01p.h +++ b/firmware/funk/nrf24l01p.h @@ -165,7 +165,7 @@ int nrf_rcv_pkt_poll_dec(int maxsize, uint8_t * pkt, uint32_t const key[4]); // more utility. void nrf_rcv_pkt_end(void); -uint8_t nrf_check_reset(void); +void nrf_check_reset(void); /* END */ diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c index d3fb731..40bd2ae 100644 --- a/firmware/lcd/display.c +++ b/firmware/lcd/display.c @@ -67,6 +67,7 @@ static void lcdWrite(uint8_t cd, uint8_t data) { #define SDA 0,9 #define RST 2,2 +#ifdef NOTYET uint8_t lcdRead(uint8_t data) { uint8_t i; @@ -109,6 +110,7 @@ uint8_t lcdRead(uint8_t data) gpioSetDir(SDA, 1); delayms(1); } +#endif void lcdInit(void) {