From 97268f237d05f7f70e13a57c7e2cda705650f440 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Tue, 3 Jan 2012 22:23:24 +0100
Subject: [PATCH 1/4] Remove unused duplicate line

---
 firmware/funk/nrf24l01p.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/firmware/funk/nrf24l01p.c b/firmware/funk/nrf24l01p.c
index 27ee840..0cb2422 100644
--- a/firmware/funk/nrf24l01p.c
+++ b/firmware/funk/nrf24l01p.c
@@ -153,7 +153,6 @@ int nrf_rcv_pkt_poll_dec(int maxsize, uint8_t * pkt, uint32_t const key[4]){
 
 //    if(key==NULL) return len;
 
-    cmpcrc=crc16(pkt,len-2);
     if(key!=NULL)
         xxtea_decode_words((uint32_t*)pkt,len/4,key);
 

From a76813ffe3c171c73f6a320cf4b0ef7342c5a316 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Tue, 3 Jan 2012 22:23:46 +0100
Subject: [PATCH 2/4] dbgmesh l0dable now has release no.

---
 firmware/l0dable/dbgmesh.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/firmware/l0dable/dbgmesh.c b/firmware/l0dable/dbgmesh.c
index a7040b7..c97d9a8 100644
--- a/firmware/l0dable/dbgmesh.c
+++ b/firmware/l0dable/dbgmesh.c
@@ -135,6 +135,8 @@ void m_time(void){
         lcdNl();
         lcdPrint("Nice:");
         lcdPrintInt(meshnice);
+	lcdPrint(" R:");
+	lcdPrint(IntToStrX(getrelease()%0xfff,3));
         lcdNl();
         lcdRefresh();
 

From ccaa6cd00e9d5d2a736aac2db1643141994b36d1 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Tue, 3 Jan 2012 22:26:37 +0100
Subject: [PATCH 3/4] Restore mesh to old condition on master branch

---
 firmware/funk/mesh.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c
index 31c69d0..5fbd393 100644
--- a/firmware/funk/mesh.c
+++ b/firmware/funk/mesh.c
@@ -43,8 +43,6 @@ void initMesh(void){
 int mesh_sanity(uint8_t * pkt){
     if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20)
         return MP_SEND;
-    if(MO_TYPE(pkt)=='T' && MO_BODY(pkt)[5])
-           return MP_SEND;
     if(MO_TYPE(pkt)=='T' && MO_TIME(pkt)<86400)
            return MP_OK;
     if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){
@@ -96,8 +94,8 @@ MPKT * meshGetMessage(uint8_t type){
 };
 
 void meshPanic(uint8_t * pkt,int bufno){
+#if 0
     static int done=0;
-#if 1
     if(!done){
 	setSystemFont();
 	lcdClear();

From 1a61837fa8114cfa398481b213fc26125b67f6bb Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Tue, 3 Jan 2012 22:27:10 +0100
Subject: [PATCH 4/4] Increase release no. to identify this version

---
 firmware/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firmware/main.c b/firmware/main.c
index ea7a125..3a66d2e 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -77,5 +77,5 @@ int main(void) {
 }
 
 int getrelease(void){
-    return 0x00000107;
+    return 0x00000108;
 };