diff --git a/firmware/SECRETS b/firmware/SECRETS new file mode 100644 index 0000000..4a05441 --- /dev/null +++ b/firmware/SECRETS @@ -0,0 +1,14 @@ +#ifndef _SECRETS_ +#define _SECRETS_ + +static uint32_t const meshkey[4] = { + 0x00000042, 0x000005ec, 0x00000023, 0x00000005 +}; +static const uint32_t openbeaconkey[4] = { + 0xB4595344, 0xD3E119B6, 0xA814D0EC, 0xEFF5A24E +}; +static uint32_t const remotekey[4] = { + 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff +}; + +#endif diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index d8be88a..37b54ec 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -50,6 +50,10 @@ WRAPOBJ=$(WRAP).o WRAPSRC=$(WRAP).c LIBFILE=lib$(LIBNAME).a +ifeq "$(FINAL)" "y" +CFLAGS+=-DFINAL +endif + ########################################################################## # Compiler settings, parameters and flags ########################################################################## diff --git a/firmware/applications/default.c b/firmware/applications/default.c index 415175e..baa86dc 100644 --- a/firmware/applications/default.c +++ b/firmware/applications/default.c @@ -29,10 +29,6 @@ void main_default(void) { case BTN_UP: // Reset config f_unlink("r0ket.cfg"); break; - case BTN_RIGHT: - GLOBAL(develmode)=1; - applyConfig(); - break; case BTN_DOWN: usbMSCInit(); while(1) @@ -41,6 +37,10 @@ void main_default(void) { }; readConfig(); + if(getInputRaw()==BTN_RIGHT){ + GLOBAL(develmode)=1; + applyConfig(); + }; randomInit(); return; diff --git a/firmware/applications/final/mesh.c b/firmware/applications/final/mesh.c index a7b27af..57843d4 100644 --- a/firmware/applications/final/mesh.c +++ b/firmware/applications/final/mesh.c @@ -120,7 +120,19 @@ char *meshmsgs(void){ return msgtypes; }; - +static inline uint32_t popcount(uint32_t *buf, uint8_t n){ + int cnt=0; + do { + unsigned m = *buf++; + m = (m & 0x55555555) + ((m & 0xaaaaaaaa) >> 1); + m = (m & 0x33333333) + ((m & 0xcccccccc) >> 2); + m = (m & 0x0f0f0f0f) + ((m & 0xf0f0f0f0) >> 4); + m = (m & 0x00ff00ff) + ((m & 0xff00ff00) >> 8); + m = (m & 0x0000ffff) + ((m & 0xffff0000) >> 16); + cnt += m; + } while(--n); + return cnt; +} extern MPKT meshbuffer[MESHBUFSIZE]; //# MENU messages @@ -152,6 +164,12 @@ void m_choose(){ case('T'): strcpy(p,"Time"); break; + case('Z'): + strcpy(p,"Schnitzel"); + break; + case('z'): + strcpy(p,"S-Score"); + break; case('i'): strcpy(p,"Invaders"); break; @@ -188,6 +206,12 @@ void m_choose(){ case('T'): lcdPrintln("Time"); break; + case('Z'): + strcpy(p,"Schnitzel"); + break; + case('z'): + strcpy(p,"S-Score"); + break; case('i'): lcdPrintln("Invaders"); break; @@ -203,7 +227,19 @@ void m_choose(){ lcdPrint(IntToStr(tm->tm_sec,2,F_LONG|F_ZEROS)); lcdNl(); - if(tmm[i]=='T'){ + if(tmm[i]=='Z'){ + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+ 6),8)); + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+10),8)); + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+14),8)); + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+18),8)); + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+22),8)); + lcdPrintln(IntToStrX(uint8ptouint32(meshbuffer[j].pkt+26),8)); + lcdPrint(IntToStr(popcount(meshbuffer[j].pkt+6,6),3,0)); + lcdPrintln(" pts."); + lcdRefresh(); + getInputWaitRelease(); + continue; + }else if(tmm[i]=='T'){ lcdPrint(IntToStr(tm->tm_mday,2,F_LONG)); lcdPrint("."); lcdPrint(IntToStr(tm->tm_mon+1,2,0)); diff --git a/firmware/applications/serial/serial.c b/firmware/applications/serial/serial.c index 287001a..e780fbf 100644 --- a/firmware/applications/serial/serial.c +++ b/firmware/applications/serial/serial.c @@ -23,13 +23,7 @@ #define BEACON_CHANNEL 81 #define BEACON_MAC "\x1\x2\x3\x2\1" -uint32_t const beaconkey[4] = { - 0xB4595344,0xD3E119B6,0xA814D0EC,0xEFF5A24E -}; -uint32_t remotekey[4] = { - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff -}; -extern uint32_t const meshkey[4]; +#include "SECRETS" char funkencrypt=0; @@ -167,7 +161,7 @@ int process(char * input){ config.maclen[0]=0x10; config.nrmacs=1; nrf_config_set(&config); - memcpy(thekey,beaconkey,sizeof(thekey)); + memcpy(thekey,openbeaconkey,sizeof(thekey)); funkencrypt=1; }else if(input[1]=='?'){ nrf_config_get(&config); diff --git a/firmware/basic/config.c b/firmware/basic/config.c index 7fad0a0..b315cc3 100644 --- a/firmware/basic/config.c +++ b/firmware/basic/config.c @@ -28,7 +28,7 @@ struct CDESC the_config[]= { {"flamemaxw", 255, 1, 255, 1, CFG_TYPE_FLAME}, {"flameminw", 0x8f, 1, 255, 1, CFG_TYPE_FLAME}, {"l0nick", 0, 0, 1 , 0, 0}, - {"chargeled", 1, 0, 1 , 0, 0}, + {"chargeled", 0, 0, 1 , 0, 0}, { NULL, 0, 0, 0 , 0, 0}, }; diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c index 43a353f..a6b7fd5 100644 --- a/firmware/basic/menu.c +++ b/firmware/basic/menu.c @@ -78,6 +78,8 @@ void handleMenu(const struct MENU *the_menu) { case BTN_RIGHT: if (the_menu->entries[menuselection].callback!=NULL) the_menu->entries[menuselection].callback(); + + setSystemFont(); if (menuflags&MENU_JUSTONCE) return; @@ -91,6 +93,7 @@ void handleMenu(const struct MENU *the_menu) { if (the_menu->entries[menuselection].callback!=NULL) the_menu->entries[menuselection].callback(); lcdRefresh(); + setSystemFont(); if (menuflags&MENU_JUSTONCE) return; diff --git a/firmware/filesystem/ffconf.h-final b/firmware/filesystem/ffconf.h-final new file mode 100644 index 0000000..6db022d --- /dev/null +++ b/firmware/filesystem/ffconf.h-final @@ -0,0 +1,188 @@ +/*---------------------------------------------------------------------------/ +/ FatFs - FAT file system module configuration file R0.08b (C)ChaN, 2011 +/----------------------------------------------------------------------------/ +/ +/ CAUTION! Do not forget to make clean the project after any changes to +/ the configuration options. +/ +/----------------------------------------------------------------------------*/ +#ifndef _FFCONF +#define _FFCONF 8237 /* Revision ID */ + + +/*---------------------------------------------------------------------------/ +/ Function and Buffer Configurations +/----------------------------------------------------------------------------*/ + +#define _FS_TINY 1 /* 0:Normal or 1:Tiny */ +/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system +/ object instead of the sector buffer in the individual file object for file +/ data transfer. This reduces memory consumption 512 bytes each file object. */ + + +#define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */ +/* Setting _FS_READONLY to 1 defines read only configuration. This removes +/ writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename, +/ f_truncate and useless f_getfree. */ + + +#define _FS_MINIMIZE 1 /* 0 to 3 */ +/* The _FS_MINIMIZE option defines minimization level to remove some functions. +/ +/ 0: Full function. +/ 1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename +/ are removed. +/ 2: f_opendir and f_readdir are removed in addition to 1. +/ 3: f_lseek is removed in addition to 2. */ + + +#define _USE_STRFUNC 0 /* 0:Disable or 1/2:Enable */ +/* To enable string functions, set _USE_STRFUNC to 1 or 2. */ + + +#define _USE_MKFS 0 /* 0:Disable or 1:Enable */ +/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */ + + +#define _USE_FORWARD 0 /* 0:Disable or 1:Enable */ +/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */ + + +#define _USE_FASTSEEK 0 /* 0:Disable or 1:Enable */ +/* To enable fast seek feature, set _USE_FASTSEEK to 1. */ + + + +/*---------------------------------------------------------------------------/ +/ Locale and Namespace Configurations +/----------------------------------------------------------------------------*/ + +#define _CODE_PAGE 1 +/* The _CODE_PAGE specifies the OEM code page to be used on the target system. +/ Incorrect setting of the code page can cause a file open failure. +/ +/ 932 - Japanese Shift-JIS (DBCS, OEM, Windows) +/ 936 - Simplified Chinese GBK (DBCS, OEM, Windows) +/ 949 - Korean (DBCS, OEM, Windows) +/ 950 - Traditional Chinese Big5 (DBCS, OEM, Windows) +/ 1250 - Central Europe (Windows) +/ 1251 - Cyrillic (Windows) +/ 1252 - Latin 1 (Windows) +/ 1253 - Greek (Windows) +/ 1254 - Turkish (Windows) +/ 1255 - Hebrew (Windows) +/ 1256 - Arabic (Windows) +/ 1257 - Baltic (Windows) +/ 1258 - Vietnam (OEM, Windows) +/ 437 - U.S. (OEM) +/ 720 - Arabic (OEM) +/ 737 - Greek (OEM) +/ 775 - Baltic (OEM) +/ 850 - Multilingual Latin 1 (OEM) +/ 858 - Multilingual Latin 1 + Euro (OEM) +/ 852 - Latin 2 (OEM) +/ 855 - Cyrillic (OEM) +/ 866 - Russian (OEM) +/ 857 - Turkish (OEM) +/ 862 - Hebrew (OEM) +/ 874 - Thai (OEM, Windows) +/ 1 - ASCII only (Valid for non LFN cfg.) +*/ + + +#define _USE_LFN 0 /* 0 to 3 */ +#define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */ +/* The _USE_LFN option switches the LFN support. +/ +/ 0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect. +/ 1: Enable LFN with static working buffer on the BSS. Always NOT reentrant. +/ 2: Enable LFN with dynamic working buffer on the STACK. +/ 3: Enable LFN with dynamic working buffer on the HEAP. +/ +/ The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN, +/ Unicode handling functions ff_convert() and ff_wtoupper() must be added +/ to the project. When enable to use heap, memory control functions +/ ff_memalloc() and ff_memfree() must be added to the project. */ + + +#define _LFN_UNICODE 0 /* 0:ANSI/OEM or 1:Unicode */ +/* To switch the character code set on FatFs API to Unicode, +/ enable LFN feature and set _LFN_UNICODE to 1. */ + + +#define _FS_RPATH 0 /* 0 to 2 */ +/* The _FS_RPATH option configures relative path feature. +/ +/ 0: Disable relative path feature and remove related functions. +/ 1: Enable relative path. f_chdrive() and f_chdir() are available. +/ 2: f_getcwd() is available in addition to 1. +/ +/ Note that output of the f_readdir fnction is affected by this option. */ + + + +/*---------------------------------------------------------------------------/ +/ Physical Drive Configurations +/----------------------------------------------------------------------------*/ + +#define _VOLUMES 1 +/* Number of volumes (logical drives) to be used. */ + + +#define _MAX_SS 512 /* 512, 1024, 2048 or 4096 */ +/* Maximum sector size to be handled. +/ Always set 512 for memory card and hard disk but a larger value may be +/ required for on-board flash memory, floppy disk and optical disk. +/ When _MAX_SS is larger than 512, it configures FatFs to variable sector size +/ and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */ + + +#define _MULTI_PARTITION 0 /* 0:Single partition or 1:Multiple partition */ +/* When set to 0, each volume is bound to the same physical drive number and +/ it can mount only first primaly partition. When it is set to 1, each volume +/ is tied to the partitions listed in VolToPart[]. */ + + +#define _USE_ERASE 0 /* 0:Disable or 1:Enable */ +/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command +/ should be added to the disk_ioctl functio. */ + + + +/*---------------------------------------------------------------------------/ +/ System Configurations +/----------------------------------------------------------------------------*/ + +#define _WORD_ACCESS 0 /* 0 or 1 */ +/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS +/ option defines which access method is used to the word data on the FAT volume. +/ +/ 0: Byte-by-byte access. +/ 1: Word access. Do not choose this unless following condition is met. +/ +/ When the byte order on the memory is big-endian or address miss-aligned word +/ access results incorrect behavior, the _WORD_ACCESS must be set to 0. +/ If it is not the case, the value can also be set to 1 to improve the +/ performance and code size. */ + + +/* A header file that defines sync object types on the O/S, such as +/ windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */ + +#define _FS_REENTRANT 0 /* 0:Disable or 1:Enable */ +#define _FS_TIMEOUT 1000 /* Timeout period in unit of time ticks */ +#define _SYNC_t HANDLE /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */ + +/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module. +/ +/ 0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect. +/ 1: Enable reentrancy. Also user provided synchronization handlers, +/ ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj +/ function must be added to the project. */ + + +#define _FS_SHARE 0 /* 0:Disable or >=1:Enable */ +/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value + defines how many files can be opened simultaneously. */ + +#endif /* _FFCONFIG */ diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c index 4727a0b..6d9d0db 100644 --- a/firmware/funk/mesh.c +++ b/firmware/funk/mesh.c @@ -14,9 +14,7 @@ char meshmsg=0; char meshnice=0; MPKT meshbuffer[MESHBUFSIZE]; -uint32_t const meshkey[4] = { - 0x00000042, 0x000005ec, 0x00000023, 0x00000005 -}; +#include "SECRETS" struct NRF_CFG oldconfig; @@ -57,6 +55,8 @@ MPKT * meshGetMessage(uint8_t type){ void mesh_cleanup(void){ time_t now=getSeconds(); for(int i=1;i> 1); + m = (m & 0x33333333) + ((m & 0xcccccccc) >> 2); + m = (m & 0x0f0f0f0f) + ((m & 0xf0f0f0f0) >> 4); + m = (m & 0x00ff00ff) + ((m & 0xff00ff00) >> 8); + m = (m & 0x0000ffff) + ((m & 0xffff0000) >> 16); + cnt += m; + } while(--n); + return cnt; +} + uint8_t mesh_recvqloop_work(void){ __attribute__ ((aligned (4))) uint8_t buf[32]; int len; @@ -166,9 +180,29 @@ uint8_t mesh_recvqloop_work(void){ // Store packet in a same/free slot MPKT* mpkt=meshGetMessage(MO_TYPE(buf)); - // Skip locked packet - if(mpkt->flags&MF_LOCK) - return 2; + // Schnitzel + if(MO_TYPE(buf)=='Z'){ + mpkt->flags=MF_USED|MF_LOCK; + MO_TIME_set(mpkt->pkt,getSeconds()); + MO_GEN_set(mpkt->pkt,0x70); + for(int i=6;ipkt[i]|=buf[i]; + + int score=popcount(MO_BODY(mpkt->pkt),6); + + MPKT* reply=meshGetMessage('z'); + + if(MO_TIME(reply->pkt)>=score) + return 1; + + MO_TIME_set(reply->pkt,score); + strcpy((char*)MO_BODY(reply->pkt),GLOBAL(nickname)); + if(GLOBAL(privacy)==0){ + uint32touint8p(GetUUID32(),meshbuffer[0].pkt+26); + meshbuffer[0].pkt[25]=0; + }; + return 1; + }; // only accept newer/better packets if(mpkt->flags==MF_USED) @@ -181,6 +215,7 @@ uint8_t mesh_recvqloop_work(void){ memcpy(mpkt->pkt,buf,MESHPKTSIZE); mpkt->flags=MF_USED; + return 1; }; diff --git a/firmware/funk/openbeacon.c b/firmware/funk/openbeacon.c index 9efe4d9..642c4a9 100644 --- a/firmware/funk/openbeacon.c +++ b/firmware/funk/openbeacon.c @@ -7,7 +7,7 @@ #include "basic/uuid.h" //const uint32_t key[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; -const uint32_t openbeaconkey[4] = { 0xB4595344,0xD3E119B6,0xA814D0EC,0xEFF5A24E }; +#include "SECRETS" const uint8_t useencryption = 1; const uint8_t mac[5] = {1,2,3,2,1}; diff --git a/firmware/l0dable/invaders.c b/firmware/l0dable/invaders.c index 1f4f425..178964a 100644 --- a/firmware/l0dable/invaders.c +++ b/firmware/l0dable/invaders.c @@ -167,6 +167,10 @@ static bool highscore_set(uint32_t score, char nick[]) { MO_TIME_set(mpkt->pkt,score); strcpy((char*)MO_BODY(mpkt->pkt),nick); + if(GLOBAL(privacy)==0){ + uint32touint8p(GetUUID32(),mpkt->pkt+26); + mpkt->pkt[25]=0; + }; return true; } diff --git a/firmware/l0dable/nick_life.c b/firmware/l0dable/nick_life.c index b4d1382..818c232 100644 --- a/firmware/l0dable/nick_life.c +++ b/firmware/l0dable/nick_life.c @@ -2,6 +2,7 @@ #include "basic/basic.h" +#include "lcd/print.h" #include "lcd/render.h" #include "lcd/display.h" @@ -28,47 +29,100 @@ typedef uint8_t uchar; int pattern=0; #define PATTERNCOUNT 3 + uchar stepmode=0; uchar randdensity=0; -//uint8_t bl=0; - -struct bitset _buf1,*buf1=&_buf1; -struct bitset _buf2,*buf2=&_buf2; - -struct bitset *life =&_buf1; -struct bitset *new =&_buf2; +static unsigned long iter=0; +struct bitset _life; +#define life (&_life) static void draw_area(); static void calc_area(); static void random_area(struct bitset *area, uchar x0, uchar y0, uchar x1, uchar y1,uchar value); static void reset_area(); -static void nextledcycle(); void ram(void) { getInputWaitRelease(); reset_area(); random_area(life,1,1,RESX,RESY,40); + static int nickx=2,nicky=10; + signed char movy=1; + static int nickwidth,nickheight; + static int nickoff=10; + static char delay=10; + static char speedmode=0; + static char LCDSHIFTX_EVERY_N=2; + static char LCDSHIFTY_EVERY_N=2; + static char ITER_EVERY_N=1; + lcdClear(); setExtFont(GLOBAL(nickfont)); - DoString(20,20,GLOBAL(nickname)); + + nickwidth=DoString(nickx,nicky,GLOBAL(nickname)); + if(nickwidth<50)nickoff=30; + nickheight=getFontHeight(); -#if 0 - gpioSetValue (RB_LED0, CFG_LED_ON); - gpioSetValue (RB_LED1, CFG_LED_ON); - gpioSetValue (RB_LED2, CFG_LED_ON); - gpioSetValue (RB_LED3, CFG_LED_ON); -#endif + char stepmode=0; while (1) { draw_area(); // xor life pattern over display content lcdDisplay(); - draw_area(); // xor life pattern again to restore original display content - lcdShift(1,-2,1); - if(getInputRaw()) - return; - delayms_queue_plus(10,0); - calc_area(); + lcdClear(); + // draw_area(); // xor life pattern again to restore original display content + // Old shift code. Can't handle longer Nicks... + // if(iter%LCDSHIFT_EVERY_N==0) lcdShift(1,-2,1); + // if(iter%LCDSHIFT_EVERY_N==0) { nickx=(nickx+1)%100-nickwidth; nicky=(nicky+1)%50;} + if(iter%LCDSHIFTX_EVERY_N==0) { nickx--; + if(nickx<(-1*nickwidth-nickoff))nickx=0; } + if(iter%LCDSHIFTY_EVERY_N==0) { nicky+=movy; + if(nicky<1 || nicky>RESY-nickheight) movy*=-1; } + DoString(nickx,nicky,GLOBAL(nickname)); + DoString(nickx+nickwidth+nickoff,nicky,GLOBAL(nickname)); + if(nickwidth