Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple

TODO

@@ -1,7 +1,7 @@
 TODO für ersten funktionierenden Stand:
 
 Hardware: 
-- Analogteil
+# Analogteil
 
 Software:
 - I2C-Code
@@ -11,10 +11,7 @@ Software:
 
 
 Später:
-- USB-Protokoll auf AVR
-- USB-Client am Rechner
-- Display-Code
 - PT1000
 - Digitalansteuerung für muxer/offsetkompensatoren
 - Gehäuse
-- Thermocouple-Buchsen
+# Thermocouple-Buchsen

cmdline/read-temp.c

@@ -74,7 +74,7 @@ int                 cnt, vid, pid;
     }
     rxValue = ((int)buffer[1] & 0xff) | (((int)buffer[0] & 0xff) << 8);
     rxIndex = ((int)buffer[3] & 0xff) | (((int)buffer[2] & 0xff) << 8);
-    fprintf(stderr, "%3d.%02d*C||", rxValue/100, rxValue%100);
+    fprintf(stderr, "%3d.%02d*C ", rxValue/100, rxValue%100);
     fprintf(stderr, "%3d.%02d*C \n", rxIndex/100, rxIndex%100);
 
     cnt = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, 2, value, index, buffer, sizeof(buffer), 5000);
@@ -83,7 +83,7 @@ int                 cnt, vid, pid;
     }
     rxValue = ((int)buffer[1] & 0xff) | (((int)buffer[0] & 0xff) << 8);
     rxIndex = ((int)buffer[3] & 0xff) | (((int)buffer[2] & 0xff) << 8);
-    fprintf(stderr, "%3d.%02d*C||", rxValue/100, rxValue%100);
+    fprintf(stderr, "%3d.%02d*C ", rxValue/100, rxValue%100);
     fprintf(stderr, "%3d.%02d*C \n", rxIndex/100, rxIndex%100);
 
 

documentation/SPI-Proto

@@ -0,0 +1,26 @@
+ 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
+ +-------------+ +-------------+ +-------------+ +-------------+
+ |   OpCode    | |   Address   | |    ValueH   | |    ValueL   |
+ +-------------+ +-------------+ +-------------+ +-------------+
+
+
+Where following values are Valid:
+|--------------------------------------------------------------------------------------------------------------------------|
+| Binary		Hex	Name		Address		ValueL		ValueH		Reply		Description|
+|--------------------------------------------------------------------------------------------------------------------------|
+| 0000001		0x01	Read-Temp	Number of	zeroes/Rand	zeroes/Rand	A 16Bit Value	Reads the  |
+|						Thermometer					Representing 	Temperature|
+|						Starting with 0					the Temperature		   |
+|--------------------------------------------------------------------------------------------------------------------------|
+| 0000002		0x02	Read-Var8	Number of the	zeroes/Rand	zeroes/Rand	A 8Bit Value	Reads 8Bit |
+|  						var-DEFINE					read from VAR	Variable   |
+|--------------------------------------------------------------------------------------------------------------------------|
+| 0000003		0x03	Read-Var16	Number of the	zeroes/Rand	zeroes/Rand	A 16Bit Value	Reads 16Bit|
+|  						var-DEFINE					read from VAR	Variable   |
+|--------------------------------------------------------------------------------------------------------------------------|
+| 0000004		0x04	Write-Var8	Number of the	Value of Var	zeroes/Rand	zeroes/Rand	Writes 8Bit|
+|  						var-DEFINE	to write					Variable   |
+|--------------------------------------------------------------------------------------------------------------------------|
+| 0000005		0x05	Write-Var16	Number of the	Value of Var	Value of Var	zeroes/Rand	Writes 16  |
+|  						var-DEFINE	to write (HIGH)	to write (LOW)			Bit Var    |
+|--------------------------------------------------------------------------------------------------------------------------|

firmware/Makefile

@@ -1,12 +1,33 @@
 DEFINES += -DF_CPU=16000000
 CFLAGS += -save-temps
-CFLAGS += -std=gnu99 # implements C99, for <util/atomic.h>
+CFLAGS += -std=gnu99 -Wall # implements C99, for <util/atomic.h>
 # this removes dead code and does global linker optimization
 #CFLAGS += -ffunction-sections -Wl,--gc-sections -Wl,--relax 
 
-OBJECTS = usbdrv/usbdrvasm.o  usbdrv/usbdrv.o main.o display.o lcd/lcd.o mcp_adc.o i2c_simple.o usb.o
 
+include Makefile.inc
 
+# symbolic targets:
+all:	master slave
 
-include avrbuild/Makefile.avrbuild
+master:
+	cd masterchip; $(MAKE) $(MFLAGS)
 
+flash-master:
+	cd masterchip; $(MAKE) $(MFLAGS) flash
+
+fuses-master:
+	cd masterchip; $(MAKE) $(MFLAGS) fuses
+
+slave:
+	cd slavechip; $(MAKE) $(MFLAGS)
+
+flash-slave:
+	cd slavechip; $(MAKE) $(MFLAGS) flash
+
+fuses-slave:
+	cd slavechip; $(MAKE) $(MFLAGS) fuses
+
+clean:
+	cd masterchip; $(MAKE) $(MFLAGS) clean
+	cd slavechip; $(MAKE) $(MFLAGS) clean

firmware/Makefile.inc

@@ -0,0 +1,13 @@
+DEFINES += -DF_CPU=16000000
+CFLAGS += -save-temps
+CFLAGS += -std=gnu99 -Wall # implements C99, for <util/atomic.h>
+# this removes dead code and does global linker optimization
+#CFLAGS += -ffunction-sections -Wl,--gc-sections -Wl,--relax 
+CFLAGS += -Wall -Os  -I. -mmcu=atmega88
+
+# further optimization:
+#CFLAGS += --param inline-call-cost=2 
+CFLAGS += -fno-move-loop-invariants  # suggestions from from v-usb
+CFLAGS += -fno-tree-scev-cprop  
+CFLAGS += -fno-inline-small-functions 
+

firmware/masterchip/Makefile

@@ -0,0 +1,67 @@
+# masterchip-makefile
+include ../Makefile.inc
+
+COMPILE = avr-gcc $(CFLAGS) $(DEFINES)
+
+OBJECTS = usbdrv/usbdrvasm.o usbdrv/usbdrv.o main.o display.o lcd/lcd.o usb.o
+
+# symbolic targets:
+all:	firmware.hex
+
+.c.o:
+	$(COMPILE) -c $< -o $@
+
+.S.o:
+	$(COMPILE) -x assembler-with-cpp -c $< -o $@
+# "-x assembler-with-cpp" should not be necessary since this is the default
+# file type for the .S (with capital S) extension. However, upper case
+# characters are not always preserved on Windows. To ensure WinAVR
+# compatibility define the file type manually.
+
+.c.s:
+	$(COMPILE) -S $< -o $@
+
+flash:	all
+	avrdude -c usbasp -p m88 -U flash:w:firmware.hex
+
+fuses:
+	avrdude -c usbasp -p m88 -U lfuse:w:0xdf:m -U hfuse:w:0xde:m # external oscillator
+
+
+## what are the source dependencies
+%.d: %.c
+	@set -e; rm -f $@;  \
+	$(COMPILE) -MM $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@; 
+# line 1: exits if anything goes wrong
+# line 2a: gcc -MM outputs dependencies
+# line 2b: insert the %.d into dependency list
+
+#main.c:	version.h
+
+
+clean:
+	rm -f *.o *.hex *.obj *.i *.s *.d */*.i */*.s */*.o */*.d version.h
+
+# file targets:
+firmware.bin:	$(OBJECTS)
+	$(COMPILE) -o firmware.bin $(OBJECTS)
+
+firmware.hex:	firmware.bin
+	rm -f firmware.hex firmware.eep.hex
+	avr-objcopy -j .text -j .data -O ihex firmware.bin firmware.hex
+	avr-size firmware.bin
+#	./checksize firmware.bin 8192 960
+# do the checksize script as our last action to allow successful compilation
+# on Windows with WinAVR where the Unix commands will fail.
+
+disasm:	firmware.bin
+	avr-objdump -d firmware.bin >disasm
+
+functionsize: disasm
+	python avrbuild/functionsize.py 
+
+countregs: disasm
+	python avrbuild/countregs.py 
+
+# for depends:
+-include $(OBJECTS:.o=.d)

firmware/masterchip/display.c

@@ -255,10 +255,6 @@ void display_bar(int8_t value, int8_t min, int8_t max) {
 	}
 }
 
-
-
-
-
 void updateTemperature() {
   if(newThermoData==1) {
     newThermoData = 0;

firmware/masterchip/display.h

@@ -5,11 +5,16 @@
 #include "lcd/lcd.h"
 #include "main.h"
 
+
 #define LCD_CHAR_HALFBAR 0x01
 #define LCD_CHAR_BAR     0x02
 #define LCD_CHAR_DEGREE  0x03
 #define LCD_CHAR_BLANK   0x20
 
+extern uint8_t newThermoData1;
+extern uint16_t thermoData[];
+
+
 extern const prog_uint8_t lcd_halfbar_char[];
 extern const prog_uint8_t lcd_bar_char[];
 extern const prog_uint8_t lcd_degree_char[];
@@ -33,6 +38,6 @@ extern void display_puthex(uint8_t outbyte);
 extern void display_bar(int8_t value, int8_t min, int8_t max);
 extern void display_putint(int16_t number);
 
-void updateTemperature();
+extern void updateTemperature();
 
 #endif

firmware/masterchip/main.c

@@ -1,10 +1,13 @@
 #include "main.h"
 
-#define SOFTTIMERNUMS 4
+uint8_t newThermoData = 1;
+uint16_t thermoData[] = {1024, 814, 2475, 2243};
+
+volatile uint16_t timer1_acc;
 uint16_t softtimer_last[SOFTTIMERNUMS];
 
 void softtimer_reset(uint8_t timernum){
-    softtimer_last[SOFTTIMERNUMS] = timer1_acc;
+    softtimer_last[timernum] = timer1_acc;
 }
 
 uint8_t softtimer(uint8_t timernum, uint16_t interval){
@@ -16,7 +19,8 @@ uint8_t softtimer(uint8_t timernum, uint16_t interval){
     return(0);
 }
 
-#define SOFTTIMER(n,a) if(softtimer((n),(a*4)))
+// SOFTTIMER( <YOUR TIMER NUM>, <YOUR INTERVAL>);
+#define SOFTTIMER(n,a) if(softtimer((n),(a*8)))
 
 
 void hardinit() {
@@ -36,6 +40,9 @@ void hardinit() {
   OCR1A = 15; // contrast
   OCR1B = 50; // brightness
 
+  // enable softtimer isr
+  TIMSK1 |= _BV(TOIE1);
+	
   // init LCD:
   lcd_init(1);
   lcd_clrscr(1);
@@ -51,27 +58,25 @@ void softinit() {
 
 
 int __attribute__((noreturn)) main(void) {
-  int i=0;
   hardinit();
   softinit();
   usbInit();
 
-  display_puts("Hallo, Welt!\n\n");
-  display_update();
-
-  
   for(;;){
     usbPoll();
 
-    SOFTTIMER(1,100){
+    SOFTTIMER(2,500) {     
-        updateTemperature();
-    }
-
       thermoData[0]=thermoData[0]+5;
       thermoData[1]=thermoData[1]+15;
       thermoData[2]=thermoData[2]+7;
       thermoData[3]=thermoData[3]+18;
-    i++; if(i%200 == 0) newThermoData = 1;
+      newThermoData = 1;
+    }
+
+    SOFTTIMER(1,250) {
+      updateTemperature();
+    }
+
   }
 }
 
@@ -82,16 +87,18 @@ int __attribute__((noreturn)) main(void) {
   asm volatile ("out %1, %0\n" : "=r" (sreg_store) : "I" (_SFR_IO_ADDR(SREG)));
   reti();
   }*/
+
 ISR(TIMER1_OVF_vect,ISR_NOBLOCK){
-    uint16_t temp;
+    uint16_t tmp;
-    temp=timer1_acc;
+    tmp=timer1_acc;
-    temp++;
+    tmp++;
-    ATOMIC_BLOCK(ATOMIC_FORCEON){ 
+
-        timer1_acc=temp;
-    }
     /* the ATOMIC is acutally only needed if timer1_acc is never read from an ISR, which
      * is probably the case.
      * ATOMIC_FORCEON: the ISR_NOBLOCK sets sei() a few cycles before.
      */
+    ATOMIC_BLOCK(ATOMIC_FORCEON){ 
+        timer1_acc=tmp;
     }
 
+}

firmware/masterchip/main.h

@@ -26,11 +26,10 @@
 #include "spi.h"
 #include "usb.h"
 
+extern uint8_t newThermoData;
+extern uint16_t thermoData[];
 
-static uint8_t newThermoData = 1;
+#define SOFTTIMERNUMS 4
-static uint16_t thermoData[] = {1024, 814, 2475, 2243};
-volatile uint16_t timer1_acc;
-
 
 #define LED1PORT PORTC
 #define LED1APIN 0

firmware/masterchip/spi.c

@@ -0,0 +1 @@
+../shared/spi.c

firmware/masterchip/spi.h

@@ -0,0 +1 @@
+../shared/spi.h

firmware/masterchip/usbdrv

@@ -0,0 +1 @@
+../../vusb-20100715/usbdrv

firmware/slavechip/Makefile

@@ -0,0 +1,66 @@
+include ../Makefile.inc
+
+COMPILE = avr-gcc $(CFLAGS) $(DEFINES)
+
+OBJECTS = main.o mcp_adc.o i2c_simple.o
+
+# symbolic targets:
+all:	firmware.hex
+
+.c.o:
+	$(COMPILE) -c $< -o $@
+
+.S.o:
+	$(COMPILE) -x assembler-with-cpp -c $< -o $@
+# "-x assembler-with-cpp" should not be necessary since this is the default
+# file type for the .S (with capital S) extension. However, upper case
+# characters are not always preserved on Windows. To ensure WinAVR
+# compatibility define the file type manually.
+
+.c.s:
+	$(COMPILE) -S $< -o $@
+
+flash:	all
+	avrdude -c usbasp -p m88 -U flash:w:firmware.hex
+
+fuses:
+	avrdude -c usbasp -p m88 -U lfuse:w:0xdf:m -U hfuse:w:0xde:m # external oscillator
+
+
+## what are the source dependencies
+%.d: %.c
+	@set -e; rm -f $@;  \
+	$(COMPILE) -MM $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@; 
+# line 1: exits if anything goes wrong
+# line 2a: gcc -MM outputs dependencies
+# line 2b: insert the %.d into dependency list
+
+#main.c:	version.h
+
+
+clean:
+	rm -f *.o *.hex *.obj *.i *.s *.d */*.i */*.s */*.o */*.d version.h
+
+# file targets:
+firmware.bin:	$(OBJECTS)
+	$(COMPILE) -o firmware.bin $(OBJECTS)
+
+firmware.hex:	firmware.bin
+	rm -f firmware.hex firmware.eep.hex
+	avr-objcopy -j .text -j .data -O ihex firmware.bin firmware.hex
+	avr-size firmware.bin
+#	./checksize firmware.bin 8192 960
+# do the checksize script as our last action to allow successful compilation
+# on Windows with WinAVR where the Unix commands will fail.
+
+disasm:	firmware.bin
+	avr-objdump -d firmware.bin >disasm
+
+functionsize: disasm
+	python avrbuild/functionsize.py 
+
+countregs: disasm
+	python avrbuild/countregs.py 
+
+# for depends:
+-include $(OBJECTS:.o=.d)

firmware/slavechip/main.c

@@ -0,0 +1,22 @@
+#include "main.h"
+#include "spi.h"
+
+
+void hardinit() {
+  /* initializes the hardware */
+
+  sei();
+}
+
+void softinit() {
+}
+
+
+int __attribute__((noreturn)) main(void) {
+  hardinit();
+  softinit();
+
+  for(;;){
+  }
+}
+

firmware/slavechip/main.h

@@ -0,0 +1,14 @@
+#ifndef __MAIN_H
+#define __MAIN_H
+#include <stdint.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+#include <util/delay.h>
+#include <util/atomic.h>
+#include <stdio.h>
+
+#define SOFTTIMERNUMS 4
+
+#endif //__MAIN_H

firmware/slavechip/spi.c

@@ -0,0 +1,78 @@
+#include <avr/io.h>
+#include <stdint.h>
+#include <math.h>
+
+
+#include <spi.h>
+
+
+/* SPI framework.
+ *
+ * currently alpha, uses interrupts, single master/single slave operation
+ */
+
+
+uint8_t * volatile spi_writeptr;
+uint8_t * volatile spi_readptr;
+uint8_t volatile spi_writelen;
+uint8_t volatile spi_readlen;
+uint8_t spi_readbuf[SPI_READBUF_LEN];
+
+
+void spi_init(){
+	uint8_t spcr, spsr, d;
+
+	/* calculate clock divisor,
+	 * gcc with optimize will do that calculation compile-time. */
+	uint8_t spi_clock_divisor(){
+		double d; 
+		d = F_CPU / SPI_BAUDRATE;
+		d = ceil((log(d)/log(2))*0.95); // clock needs dividing by 2^d
+										// the 0.95 to avoid ceil issues
+		return d-1;  // the -1 because minimum divisor is /2
+	}
+
+	d = spi_clock_divisor();
+	if(d>7){
+                #warning "spi baudrate too slow, cannot be set"
+		d=7;
+	}
+
+	//TODO: DDRs setzen
+	spsr = 0;
+	spsr |=	(d & 1) ? 0 : _BV(SPI2X);
+	spcr = 0 | _BV(SPIE) | _BV(SPE);
+	spcr |= (d & 2) ? _BV(SPR0) : 0;
+	spcr |= (d & 4) ? _BV(SPR1) : 0;
+
+#ifdef SPI_MASTER
+	spcr |= _BV(MSTR);
+#endif		
+	SPCR = spcr;
+	SPSR = spsr;
+
+	// initialize interface for ISR:
+	spi_readptr = spi_readbuf;
+	spi_readlen = SPI_READBUF_LEN;
+	spi_writeptr = NULL;
+}
+
+// return true on success, false on error
+uint8_t spi_write(uint8_t *data, uint8_t len){
+	if(spi_writeptr != NULL){
+		return 0
+	}
+	spi_writeptr = data;
+	spi_writelen = len;
+	//TODO: handle SS, write out first byte
+	return 1;
+}
+
+#ifdef SPI_MASTER
+ISR(SPI_vector){
+
+
+
+
+}
+#endif //SPI_MASTER

firmware/slavechip/spi.h

@@ -0,0 +1,6 @@
+#define SPI_BAUDRATE 1000000
+#define SPI_MASTER 1
+#define SPI_READBUF_LEN 32
+
+uint8_t spi_write(uint8_t *data, uint8_t len);
+void spi_init();

firmware/usbdrv

@@ -1 +0,0 @@
-../vusb-20100715/usbdrv/