Merge branch 'master' of github.com:r0ket/r0ket

firmware/applications/final.c

@@ -9,6 +9,7 @@
 #include "basic/ecc.h"
 
 #include "basic/config.h"
+#include "filesystem/execute.h"
 
 /**************************************************************************/
 

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"

firmware/applications/final/flame.c

@@ -154,6 +154,7 @@ void init_flame(void) {
 
 #include "lcd/print.h"
 
+// //# MENU flame
 void ChkFlame(void) {
     do{
         lcdClear();

firmware/applications/final/nickname.c

@@ -11,6 +11,7 @@
 
 #include "filesystem/ff.h"
 #include "filesystem/select.h"
+#include "filesystem/execute.h"
 
 #include <string.h>
 

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){

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
 }

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;
 };

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 */
 

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) {