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

firmware/.gitignore

@@ -6,3 +6,4 @@ lcd/allfonts.h
 Makefile.dep
 table.c
 table.h
+SECRETS.release

firmware/SECRETS

@@ -1,6 +1,8 @@
 #ifndef _SECRETS_
 #define _SECRETS_
 
+#undef ENCRYPT_L0DABLE
+
 static uint32_t const meshkey[4] = {
     0x00000042, 0x000005ec, 0x00000023, 0x00000005
 };

firmware/basic/config.c

@@ -44,7 +44,10 @@ char nickl0[FILENAMELEN];
 void applyConfig(){
     if(GLOBAL(lcdcontrast)>0)
         lcdSetContrast(GLOBAL(lcdcontrast));
-    enableConfig(CFG_TYPE_DEVEL,GLOBAL(develmode));
+    if(GLOBAL(develmode))
+        enableConfig(CFG_TYPE_DEVEL,1);
+    if(isNight())
+        backlightSetBrightness(GLOBAL(lcdbacklight));
 };
 
 int saveConfig(void){

firmware/getkey.pl

@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+#
+# vim:set ts=4 sw=4:
+
+use strict;
+
+my $good;
+
+my $search=shift;
+
+open(F,"<","SECRETS") || die;
+
+while(<F>){
+	chomp;s///;
+	if($good){
+		s/0x//g;y/ ,;//d;
+		print $_,"\n";
+	exit;
+	};
+	if(/$search/){
+		$good=1;
+	};
+};

firmware/release-all

@@ -69,8 +69,28 @@ mv l0dable/*.c0d $TARG/files/
 mv l0dable/*.int $TARG/files/
 mv l0dable/*.nik $TARG/files/
 
+skey=`./getkey.pl l0dable_sign`
+ekey=`./getkey.pl l0dable_crypt`
+
+if [ -z "$ekey" ] ; then 
+    echo E-Key fail
+    exit 1
+fi
+
+if [ -z "$skey" ] ; then 
+    echo S-Key fail
+    exit 1
+fi
+
+for a in $TARG/files/*.c0d $TARG/files/*.int $TARG/files/*.nik ; do
+    echo Crypting $a
+    ../tools/crypto/xxtea -e -k $ekey -s -k $skey $a
+done
+
+
 echo "###"
 echo "### Done. Yay!"
 echo "###"
 
 git checkout SECRETS
+git checkout filesystem/ffconf.h