 Dario Ernst
|
ecfa164f43
|
resolved conflict
|
15 years ago |
Paul Goeser
|
d676717fe8
|
Merge branch 'testing_offest'
Conflicts:
firmware/slavechip/main.c
|
15 years ago |
|
Paul Goeser
|
d6ecd86cf9
|
offset-compensation tested, F_CPU fixed
|
15 years ago |
|
Dario Ernst
|
687c51d2ef
|
various changes, introduced calc_temp function
|
15 years ago |
|
Dario Ernst
|
4056a4051f
|
renamed master display function and made it compile again
|
15 years ago |
|
Dario Ernst
|
1a824d85dd
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
|
15 years ago |
|
Dario Ernst
|
60dc8e5381
|
added and fixed ede indexfiles
|
15 years ago |
|
Paul Goeser
|
2ef03fc8f2
|
successful temperature readout
|
15 years ago |
|
Dario Ernst
|
d8e0702729
|
spi communication works!!eleven!
|
15 years ago |
|
Dario Ernst
|
8c24da5c8c
|
simplifying of the proto spaghetti code (still doesn't work)
|
15 years ago |
|
Paul Goeser
|
c6542e4a3f
|
spi protocol fix (still untested)
|
15 years ago |
|
Paul Goeser
|
ed66f05f4c
|
still debugging, pure chaos
|
15 years ago |
|
Paul Goeser
|
95ecf21807
|
temp state, debugging spi
|
15 years ago |
|
Paul Goeser
|
f00c4e24e1
|
debugging of spi. status: master no longer freezes, still no response from slave via usb
|
15 years ago |
|
Paul Goeser
|
2726d543b5
|
first try getting both chips to work
|
15 years ago |
|
Paul Goeser
|
e2cb525cce
|
fun multiuser include resolvedness fun
|
15 years ago |
 Nidan
|
0f3b2b76db
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
Conflicts:
firmware/masterchip/spi_proto.h
firmware/slavechip/spi_proto.c
|
15 years ago |
|
Nidan
|
d7d4e5836d
|
moved spi_proto into a single file again
|
15 years ago |
|
Paul Goeser
|
5f7abba64c
|
fixed spi dependency crazyness
|
15 years ago |
|
Paul Goeser
|
5e68bf9810
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
|
15 years ago |
|
Paul Goeser
|
505405c2c8
|
spi_config
|
15 years ago |
|
Nidan
|
7b190e7119
|
added spi interface for usb.c
|
15 years ago |
|
Nidan
|
b882f9b6ea
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
Conflicts:
firmware/masterchip/spi_proto.c
firmware/masterchip/spi_proto.h
|
15 years ago |
|
Nidan
|
f2007d07ec
|
master side of spi protocol
|
15 years ago |
|
Dario Ernst
|
0eccb96b39
|
added todo
|
15 years ago |
|
Dario Ernst
|
5614ec78df
|
could work a bit better now?
|
15 years ago |
|
Dario Ernst
|
d0020aac14
|
fixed doc a bit, trying to add usb->spi interface
|
15 years ago |
|
Dario Ernst
|
017e966dae
|
fixed softtimer includestuff
|
15 years ago |
|
Matthias Merz
|
53f0a3f673
|
add deletion of firmware.bin to Makefile
|
15 years ago |
|
Dario Ernst
|
d0757f7799
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
|
15 years ago |
|
Dario Ernst
|
ca82044d49
|
added softtimer to slave
|
15 years ago |
|
Dario Ernst
|
8c1d74acda
|
moved softtimer to own file
|
15 years ago |
|
Matthias Merz
|
3d3ed50676
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
|
15 years ago |
|
Matthias Merz
|
35db9c591b
|
fix paths for functionsize/countregs
|
15 years ago |
|
Matthias Merz
|
76679b2d5f
|
Merge branch 'master' of gitorious.ghostdub.de:avr/thermocouple
|
15 years ago |
|
Matthias Merz
|
01fb4da199
|
tree reorg for separate master/slave build-dirs
* moved files
* rudimentary Makefile-support
|
15 years ago |
