ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a few warnings

This commit is contained in:
Stefan `Sec` Zehl 2011-08-01 05:22:24 +02:00
parent 61c1293611
commit cccb869423
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/basic/config.c
View File

@ -1,6 +1,7 @@
#include <sysinit.h> #include <sysinit.h>
#include "basic/basic.h" #include "basic/basic.h"
#include "lcd/display.h"
#include "lcd/print.h" #include "lcd/print.h"
#include "filesystem/ff.h" #include "filesystem/ff.h"
#include "basic/random.h" #include "basic/random.h"
@ -32,7 +33,7 @@ char nickfont[FILENAMELEN];
void applyConfig(){ void applyConfig(){
if(GLOBAL(lcdcontrast)>0) if(GLOBAL(lcdcontrast)>0)
lcdSetContrast(GLOBAL(lcdcontrast)); lcdSetContrast(GLOBAL(lcdcontrast));
return 0; return;
}; };
int saveConfig(void){ int saveConfig(void){

6
firmware/basic/night.c
View File

@ -14,8 +14,6 @@ void LightCheck(void){
int iocon; int iocon;
char iodir; char iodir;
int value;
iocon=IOCON_PIO1_11; iocon=IOCON_PIO1_11;
// iodir=gpioGetDir(RB_LED3); // iodir=gpioGetDir(RB_LED3);
iodir= (GPIO_GPIO1DIR & (1 << (RB_LED3) ))?1:0; iodir= (GPIO_GPIO1DIR & (1 << (RB_LED3) ))?1:0;
@ -28,10 +26,6 @@ void LightCheck(void){
gpioSetDir(RB_LED3, iodir); gpioSetDir(RB_LED3, iodir);
IOCON_PIO1_11=iocon; IOCON_PIO1_11=iocon;
if(threshold==0){ // uninitialized?
threshold=320;
};
if(_isnight && light/SAMPCT>(threshold+RANGE)) if(_isnight && light/SAMPCT>(threshold+RANGE))
_isnight=0; _isnight=0;

1
firmware/basic/random.c
View File

@ -1,6 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include "random.h" #include "random.h"
#include "xxtea.h" #include "xxtea.h"
#include "core/adc/adc.h"
#define STATE_SIZE 8 #define STATE_SIZE 8
uint32_t state[STATE_SIZE]; uint32_t state[STATE_SIZE];

2
firmware/funk/filetransfer.c
View File

@ -108,7 +108,7 @@ int filetransfer_receive(uint8_t *mac, uint32_t const k[4])
} }
lcdRefresh(); lcdRefresh();
if( fres < 0 ) if( fres < 0 )
return; return 1;
//nrf_set_rx_mac(0, 32, 5, macbuf); //nrf_set_rx_mac(0, 32, 5, macbuf);
xxtea_decode_words((uint32_t *)buf, wordcount, k); xxtea_decode_words((uint32_t *)buf, wordcount, k);

1
firmware/funk/rftransfer.c
View File

@ -1,6 +1,7 @@
#include "rftransfer.h" #include "rftransfer.h"
#include "nrf24l01p.h" #include "nrf24l01p.h"
#include <basic/basic.h> #include <basic/basic.h>
#include <basic/random.h>
#include <core/systick/systick.h> #include <core/systick/systick.h>
#include <lcd/print.h> #include <lcd/print.h>

1
firmware/main.c
View File

@ -5,6 +5,7 @@
#include "basic/basic.h" #include "basic/basic.h"
#include "lcd/render.h" #include "lcd/render.h"
#include "filesystem/ff.h"
/**************************************************************************/ /**************************************************************************/