From 87da2da32decb00f6273dadd31c771286c87c822 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:31:48 +0100 Subject: [PATCH 1/4] added spi-accessible temperatures array --- firmware/slavechip/main.c | 13 +++++++++++-- firmware/slavechip/main.h | 1 + firmware/slavechip/spi_pointers.c | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index f402268..f1172b2 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -4,6 +4,8 @@ uint8_t foo; uint16_t bar; uint16_t timertmp; +uint16_t temperatures[4]; + void baz() { foo++; @@ -24,6 +26,15 @@ void hardinit() { } void softinit() { + // TODO: to prevent evil random access and stuff? + temperatures[0] = 0; + temperatures[1] = 0; + temperatures[2] = 0; + temperatures[3] = 0; + + //test values + foo = 0x87; + bar= 0xfafa; } @@ -31,8 +42,6 @@ void softinit() { int __attribute__((noreturn)) main(void) { hardinit(); softinit(); - foo = 0x87; - bar= 0xfafa; for(;;){ diff --git a/firmware/slavechip/main.h b/firmware/slavechip/main.h index 4aa595d..881d47e 100644 --- a/firmware/slavechip/main.h +++ b/firmware/slavechip/main.h @@ -16,6 +16,7 @@ extern uint8_t foo; extern uint16_t bar; extern uint16_t timertmp; +extern uint16_t temperatures[]; void baz(); diff --git a/firmware/slavechip/spi_pointers.c b/firmware/slavechip/spi_pointers.c index f081a5a..f592ff6 100644 --- a/firmware/slavechip/spi_pointers.c +++ b/firmware/slavechip/spi_pointers.c @@ -13,6 +13,10 @@ uint8_t *spi_proto_globals8[] = { }; uint16_t *spi_proto_globals16[] = { &timertmp, + &temperatures[0], + &temperatures[1], + &temperatures[2], + &temperatures[3], &bar, &bar, &bar, From a5df084243f05b70442617f21ba10bc7d2f93003 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:34:59 +0100 Subject: [PATCH 2/4] do_stuff prototype ... maybe? --- firmware/slavechip/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index 1088cf1..01fd691 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -35,6 +35,7 @@ void hardinit() { spi_init(); muxer_init(); + // mpcadc_init(0xdeadbeef); sei(); } @@ -60,7 +61,11 @@ int __attribute__((noreturn)) main(void) { for(;;){ SOFTTIMER(1,500) { - // do_stuff(); + // do_stuff(); + // muxer_set(some-next-channel); + // if(mcpadc_has_new_data()) { + // temperatures[some-next-channel] = mpcadc_get_data(); + // } } } From 7ba121ea766734e68009114aa029239b839a1695 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:35:39 +0100 Subject: [PATCH 3/4] uhm, more refined? --- firmware/slavechip/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index 01fd691..0055165 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -61,10 +61,11 @@ int __attribute__((noreturn)) main(void) { for(;;){ SOFTTIMER(1,500) { - // do_stuff(); - // muxer_set(some-next-channel); - // if(mcpadc_has_new_data()) { - // temperatures[some-next-channel] = mpcadc_get_data(); + // for(int i=0; i < 4; i++) { + // muxer_set(i); + // if(mcpadc_has_new_data()) { + // temperatures[i] = mpcadc_get_data(); + // } // } } From b03d71be04c6a008294f429314de8597e56c2f30 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jan 2011 22:36:30 +0100 Subject: [PATCH 4/4] starting adconversion npw --- firmware/slavechip/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index 0055165..fa3b521 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -36,6 +36,7 @@ void hardinit() { muxer_init(); // mpcadc_init(0xdeadbeef); + // mpcadc_start_conv(); sei(); }