From f976b28761dd376e94d584c0b3fc9d33d257ef12 Mon Sep 17 00:00:00 2001 From: Andreas Auras Date: Tue, 9 Feb 2010 22:55:50 +0100 Subject: Prepare for public use --- .cproject | 4548 +++++++++++++++++++++++++++++++--------------- .project | 4 +- MANIFEST.in | 2 +- README | 52 +- pwm_appl/10ch_pwm_appl.c | 2 +- pwm_boot/10ch_pwm_boot.c | 2 +- setup.py | 2 +- usb_appl/10ch_usb_appl.c | 3 +- usb_boot/10ch_usb_boot.c | 2 +- 9 files changed, 3137 insertions(+), 1480 deletions(-) diff --git a/.cproject b/.cproject index d869e3a..927156a 100644 --- a/.cproject +++ b/.cproject @@ -1,1450 +1,3098 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 2c52d78..ac8d1ad 100644 --- a/.project +++ b/.project @@ -36,7 +36,7 @@ org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/df10ch/usb_boot} + ${workspace_loc:/df10ch/pwm_appl} org.eclipse.cdt.make.core.cleanBuildTarget @@ -68,7 +68,7 @@ org.eclipse.cdt.make.core.useDefaultBuildCmd - false + true diff --git a/MANIFEST.in b/MANIFEST.in index 5ecd9c6..eb762f3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -COPYING +include COPYING diff --git a/README b/README index 7d9f862..963cb90 100644 --- a/README +++ b/README @@ -4,31 +4,33 @@ Written by: Andreas Auras (yak54@gmx.net) See the file COPYING for license information. -This project uses Objective Development's firmware-only USB driver V-USB -for Atmel AVR microcontrollers. For more information please visit -http://www.obdev.at/vusb/ - +This project is hosted at: +http://projects.vdr-developer.org/projects/show/atmolight-controller More documentation (currently only in german language) about this project can be found at: - http://www.vdr-wiki.de/wiki/index.php/VDR_Wiki:DF10CH_Atmolight_Kontroller +This project uses Objective Development's firmware-only USB driver V-USB +for Atmel AVR microcontrollers. For more information please visit +http://www.obdev.at/vusb/ + + This directory contains the firmware, DF10CH setup program and KiCad files of hardware design: -README The file you are currently reading -df10ch_setup_pkg/ Python modules needed by the DF10CH setup program -pwm_appl/ Application firmware for PWM-Prozessor -pwm_boot/ Bootloader firmware for PWM-Prozessor -usb_appl/ Application firmware for USB-Prozessor -usb_boot/ Bootloader firmware for USB-Prozessor -usbdrv/ Objective Development's firmware-only USB driver V-USB for Atmel AVR microcontrollers -kicad/ KiCad files of hardware design: circuit and board layout -df10ch_common.h Common include file used by firmware -df10ch_usb_proto.h Include file with definitions of implemented USB communication protocol -df10ch_setup.py Main python script of DF10CH setup program -setup.py Python script used for installation of Df10CH setup program -MANIFEST.in File used by Python installation script +README The file you are currently reading +df10ch_setup_pkg/ Python modules needed by the DF10CH setup program +pwm_appl/ Application firmware for PWM-Prozessor +pwm_boot/ Bootloader firmware for PWM-Prozessor +usb_appl/ Application firmware for USB-Prozessor +usb_boot/ Bootloader firmware for USB-Prozessor +usbdrv/ Objective Development's firmware-only USB driver V-USB for Atmel AVR microcontrollers +kicad/ KiCad files of hardware design: circuit and board layout +df10ch_common.h Common include file used by firmware +df10ch_usb_proto.h Include file with definitions of implemented USB communication protocol +df10ch_setup.py Main python script of DF10CH setup program +setup.py Python script used for installation of Df10CH setup program +MANIFEST.in File used by Python installation script @@ -38,14 +40,22 @@ Building the hardware: You will find design files of circuit and board layout for use in KiCad within the kicad/ subdirectory. The files are generated with KiCad version 20090216-final. +File "10ch_pwm_ctrl-Lötseite.ps" is a postscript plot of the board layout +File "10ch_pwm_ctrl.lst" is a list of the needed hardware components for the board + +You can produce other plot formats (e.g. Gerber, HPGL) and drill files by using KiCads plot features. +You can download KiCad from here: http://kicad.sourceforge.net + ---------------------- Building the firmware: ---------------------- -For building the firmware for the two Atmel AVR microcontrollers you need AVR-GCC (>=20090313) installed. -Each firmware subdirectory contains a Makefile for compiling and flashing of firmware: +For building the firmware for the two Atmel AVR microcontrollers you need AVR-GCC installed. +On debian based systems these are packages avr-gcc, binutils-avr, avr-libc, avrdude + +Each firmware sub directory contains a Makefile for compiling and flashing of firmware: Compiling firmware: @@ -79,7 +89,7 @@ On debian based systems these are packages: python2.6, python-tk, python-usb, li You can start the program directly from this distribution directory with: - ./df10ch_setup.py + python df10ch_setup.py You can also install the program to the default python installation location with: diff --git a/pwm_appl/10ch_pwm_appl.c b/pwm_appl/10ch_pwm_appl.c index 0aa7ea4..afb4350 100644 --- a/pwm_appl/10ch_pwm_appl.c +++ b/pwm_appl/10ch_pwm_appl.c @@ -71,7 +71,7 @@ FUSES = .extended = (FUSE_BODLEVEL1 & FUSE_BODLEVEL0), }; LOCKBITS = (LB_MODE_1 & BLB0_MODE_1 & BLB1_MODE_2); -SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; +//SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; // --- diff --git a/pwm_boot/10ch_pwm_boot.c b/pwm_boot/10ch_pwm_boot.c index 986b9da..787f5df 100644 --- a/pwm_boot/10ch_pwm_boot.c +++ b/pwm_boot/10ch_pwm_boot.c @@ -72,7 +72,7 @@ FUSES = .extended = (FUSE_BODLEVEL1 & FUSE_BODLEVEL0), }; LOCKBITS = (LB_MODE_1 & BLB0_MODE_1 & BLB1_MODE_2); -SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; +//SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; // --- diff --git a/setup.py b/setup.py index c81ca90..a71942e 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ from distutils.core import setup setup(name='df10ch_setup', - version='0.1', + version='1', description='DF10CH Setup program', author='Andreas Auras', author_email='yak54@gmx.net', diff --git a/usb_appl/10ch_usb_appl.c b/usb_appl/10ch_usb_appl.c index f5a1ce4..3728c55 100644 --- a/usb_appl/10ch_usb_appl.c +++ b/usb_appl/10ch_usb_appl.c @@ -67,8 +67,7 @@ FUSES = .high = (FUSE_SPIEN & FUSE_CKOPT & FUSE_BOOTSZ1 & FUSE_BOOTSZ0) }; LOCKBITS = (LB_MODE_1 & BLB0_MODE_1 & BLB1_MODE_2); - -SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; +//SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; #define EE_MEM_SIZE (E2END + 1) diff --git a/usb_boot/10ch_usb_boot.c b/usb_boot/10ch_usb_boot.c index 7ba4d92..4d90a4a 100644 --- a/usb_boot/10ch_usb_boot.c +++ b/usb_boot/10ch_usb_boot.c @@ -68,7 +68,7 @@ FUSES = .high = (FUSE_SPIEN & FUSE_CKOPT & FUSE_BOOTSZ1 & FUSE_BOOTSZ0 & FUSE_BOOTRST) }; LOCKBITS = (LB_MODE_1 & BLB0_MODE_1 & BLB1_MODE_2); -SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; +//SIGNATURE_DATA = { SIGNATURE_2, SIGNATURE_1, SIGNATURE_0 } ; // --- -- cgit v1.2.3