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

Mesh now turns message LED on on new message

This commit is contained in:
Stefan `Sec` Zehl 2011-08-04 14:54:16 +02:00
parent b814761438
commit 2e1f1a69d1
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/applications/final/mesh.c
View File

@ -128,6 +128,9 @@ void m_choose(){
char list[99]; char list[99];
int i=0; int i=0;
meshmsg=0;
gpioSetValue (RB_LED1, 0);
while(1){ while(1){
char *p=list; char *p=list;
strcpy(p,"Note"); strcpy(p,"Note");
@ -231,5 +234,10 @@ void m_choose(){
void tick_mesh(void){ void tick_mesh(void){
if(GLOBAL(privacy)<2) if(GLOBAL(privacy)<2)
mesh_systick(); mesh_systick();
if(_timectr%64)
if(meshmsg){
gpioSetValue (RB_LED1, 1);
meshmsg=0;
};
}; };

7
firmware/funk/mesh.c
View File

@ -9,6 +9,7 @@
char meshgen=0; // Generation char meshgen=0; // Generation
char meshincctr=0; char meshincctr=0;
char meshmsg=0;
MPKT meshbuffer[MESHBUFSIZE]; MPKT meshbuffer[MESHBUFSIZE];
uint32_t const meshkey[4] = { uint32_t const meshkey[4] = {
@ -124,9 +125,13 @@ void mesh_recvloop(void){
// only accept newer/better packets // only accept newer/better packets
if(mpkt->flags==MF_USED) if(mpkt->flags==MF_USED)
if(MO_TIME(buf)<MO_TIME(mpkt->pkt)) if(MO_TIME(buf)<=MO_TIME(mpkt->pkt))
continue; continue;
if((MO_TYPE(buf)>='A' && MO_TYPE(buf)<='C') ||
(MO_TYPE(buf)>='A' && MO_TYPE(buf)<='C'))
meshmsg=1;
memcpy(mpkt->pkt,buf,MESHPKTSIZE); memcpy(mpkt->pkt,buf,MESHPKTSIZE);
mpkt->flags=MF_USED; mpkt->flags=MF_USED;

1
firmware/funk/mesh.h
View File

@ -30,6 +30,7 @@ typedef struct {
extern char meshgen; // Generation extern char meshgen; // Generation
extern char meshincctr; // Time checker extern char meshincctr; // Time checker
extern char meshmsg; // Is there something interesting?
extern MPKT meshbuffer[MESHBUFSIZE]; extern MPKT meshbuffer[MESHBUFSIZE];
void initMesh(void); void initMesh(void);