From a7c737f62c6311e8ee0fcb7fd26044e222698a8f Mon Sep 17 00:00:00 2001 From: kiu Date: Sun, 24 Jul 2011 03:31:47 +0200 Subject: [PATCH 1/4] added secs night detection --- firmware/applications/flame.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/firmware/applications/flame.c b/firmware/applications/flame.c index 6511158..a9a5343 100644 --- a/firmware/applications/flame.c +++ b/firmware/applications/flame.c @@ -33,8 +33,6 @@ #define FLAME_DOWN 0x03 #define FLAME_DOWN_WAIT 0x04 -uint8_t isNight = 1; //TODO SEC implement me - void ReinvokeISP(void); /**************************************************************************/ @@ -58,7 +56,7 @@ void tick_flame(void) { // every 10ms flameTicks++; if (flameMode == FLAME_OFF) { - if (isNight == 1) { + if (isNight()) { flameTicks = 0; flameMode = FLAME_UP; } @@ -108,7 +106,7 @@ void main_flame(void) { if (flameI2Csend == 1) { flameI2Csend = 0; - flameSetI2C(FLAME_I2C_CR_PWM0, flameI2Cpwm); // set pwm + flameSetI2C(FLAME_I2C_CR_PWM0, flameI2Cpwm); // set pwm } char key = getInput(); From 561daa9406ff9f1d9bf805017ccb9e1037d77524 Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 24 Jul 2011 08:33:03 +0200 Subject: [PATCH 2/4] Removed mmap code which lingered around from very early simulat0r approach --- simulat0r/firmware/core/sysinit.c | 80 +------------------------------ 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/simulat0r/firmware/core/sysinit.c b/simulat0r/firmware/core/sysinit.c index 470d282..9624f99 100644 --- a/simulat0r/firmware/core/sysinit.c +++ b/simulat0r/firmware/core/sysinit.c @@ -1,83 +1,5 @@ -#include -#include -#include -#include -#include -#include - -//#define handle_error(msg) do { perror(msg); exit(EXIT_FAILURE); } while (0) -#define handle_error(msg) do { perror(msg); exit(EXIT_FAILURE); } while (0) - -#include "core/lpc134x.h" - -void testByte(void* addr) { - fprintf(stderr,"Testing address %x : read ",addr); - fprintf(stderr,"%x, write ",(int)(*((char*)addr))); - ++(*((char*)addr)); - fprintf(stderr,"%x",(int)(*((char*)addr))); - --(*((char*)addr)); - fprintf(stderr," OK\n"); -} - -void testMemoryHack(void* addr,long size) { - fprintf(stderr,"Testing memory range %x - %x\n",addr,addr+size); - for(void* p=addr; p= sb.st_size) { - fprintf(stderr, "offset is past end of file\n"); - exit(EXIT_FAILURE); - } - - length = size; - - addr = mmap(address, length + offset - pa_offset, PROT_READ | PROT_WRITE, - MAP_PRIVATE, fd, pa_offset); - if (addr == MAP_FAILED) - handle_error("mmap"); - if(addr!=address) { - fprintf(stderr, "mmap: wanted %x, got %x: ",address,addr); - handle_error("mmap address discrepancy"); - } - // testMemoryHack(address,size); - fprintf(stderr,"Range %x tested\n",addr); -} - +#include "core/sysinit.h" void systemInit() { - // setupMemoryHack((void*)0x40000000,0x1000000); - // setupMemoryHack((void*)0x50000000,10*1024*1024); - // setupMemoryHack((void*)0x10000000,10*1024*1024); - // systick stuff unmappable setupMemoryHack((void*)0xe0000000,0x10000); - -#if 0 - printf("Test %d\n",SSP_SSP0CR0); - printf("Test2 %d\n",++SSP_SSP0CR0); - printf("Test3 pre %x\n",&SYSTICK_STRELOAD); - // printf("Test3 %d\n",++SYSTICK_STRELOAD); -#endif } From c7e867815dbf5a62a0dcb8cdbac9d78fe5af7f3b Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 24 Jul 2011 08:34:25 +0200 Subject: [PATCH 3/4] Added include bridge files for new r0ket source files --- simulat0r/firmware/applications/tester.c | 2 ++ simulat0r/firmware/basic/night.c | 2 ++ simulat0r/firmware/basic/random.c | 2 ++ simulat0r/firmware/basic/random.h | 2 ++ simulat0r/firmware/basic/uuid.h | 2 ++ 5 files changed, 10 insertions(+) create mode 100644 simulat0r/firmware/applications/tester.c create mode 100644 simulat0r/firmware/basic/night.c create mode 100644 simulat0r/firmware/basic/random.c create mode 100644 simulat0r/firmware/basic/random.h create mode 100644 simulat0r/firmware/basic/uuid.h diff --git a/simulat0r/firmware/applications/tester.c b/simulat0r/firmware/applications/tester.c new file mode 100644 index 0000000..2ae8928 --- /dev/null +++ b/simulat0r/firmware/applications/tester.c @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/applications/tester.c" diff --git a/simulat0r/firmware/basic/night.c b/simulat0r/firmware/basic/night.c new file mode 100644 index 0000000..9365e41 --- /dev/null +++ b/simulat0r/firmware/basic/night.c @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/night.c" diff --git a/simulat0r/firmware/basic/random.c b/simulat0r/firmware/basic/random.c new file mode 100644 index 0000000..7742b7c --- /dev/null +++ b/simulat0r/firmware/basic/random.c @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/random.c" diff --git a/simulat0r/firmware/basic/random.h b/simulat0r/firmware/basic/random.h new file mode 100644 index 0000000..63abafb --- /dev/null +++ b/simulat0r/firmware/basic/random.h @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/random.h" diff --git a/simulat0r/firmware/basic/uuid.h b/simulat0r/firmware/basic/uuid.h new file mode 100644 index 0000000..0503c55 --- /dev/null +++ b/simulat0r/firmware/basic/uuid.h @@ -0,0 +1,2 @@ +/* AUTOGENERATED SOURCE FILE */ +#include "../../../firmware/basic/uuid.h" From 9a77b01cef829ee210ed04bb3b5df93bb30031e3 Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 24 Jul 2011 08:59:56 +0200 Subject: [PATCH 4/4] Use xor drawing to animate game of life over arbitrary display content --- firmware/applications/life.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/firmware/applications/life.c b/firmware/applications/life.c index bafee14..1e3ed12 100644 --- a/firmware/applications/life.c +++ b/firmware/applications/life.c @@ -2,9 +2,9 @@ #include "basic/basic.h" -//#include "lcd/render.h" +#include "lcd/render.h" #include "lcd/display.h" -//#include "lcd/allfonts.h" +#include "lcd/allfonts.h" #define BITSET_X (RESX+2) #define BITSET_Y (RESY+2) @@ -79,7 +79,7 @@ uint32_t sum_area(struct bitset *area, uchar x0, uchar y0, uchar x1, uchar y1) { void draw_area() { for(uchar x=0; x