Move config.h to mcu_config.h, remove AVR Studio project file.
authorMalte S. Stretz <mss@apache.org>
Sat, 10 Jan 2009 19:34:05 +0000 (19:34 +0000)
committerMalte S. Stretz <mss@apache.org>
Sat, 10 Jan 2009 19:34:05 +0000 (19:34 +0000)
src/dmx.c
src/dmxpainter.aps [deleted file]
src/main.c
src/mcu.h
src/mcu_atmega8.h
src/mcu_config.h [moved from src/config.h with 100% similarity]
src/tlc.c
src/tlc.h

index 1082fcb..a8fe7fa 100644 (file)
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -1,6 +1,5 @@
 #include "dmx.h"
 
-#include "config.h"
 #include "mcu.h"
 
 #include "sched.h"
@@ -147,4 +146,4 @@ void dmx_int_disable()
 
 #else
 void dmx_init(void) {}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/dmxpainter.aps b/src/dmxpainter.aps
deleted file mode 100644 (file)
index 8fc0147..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<AVRStudio><MANAGEMENT><ProjectName>dmxpainter</ProjectName><Created>24-Oct-2008 15:37:50</Created><LastEdit>06-Jan-2009 18:53:00</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>24-Oct-2008 15:37:50</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>dmxpainter.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>C:\dmxpainter\src\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega8.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>gs_buffer</Variables><Variables>temp</Variables><Variables>dc_buffer</Variables><Variables>func</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="39" file="tlc.c" token="  pin_on(PIN_TLC_BLNK);" offset="0"/><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="78" file="tlc.c" token="  pin_out_off(PIN_TLC_GSCK);" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>sd.c</SOURCEFILE><SOURCEFILE>tlc.c</SOURCEFILE><SOURCEFILE>buffer.c</SOURCEFILE><SOURCEFILE>dmx.c</SOURCEFILE><SOURCEFILE>sched.c</SOURCEFILE><HEADERFILE>bits.h</HEADERFILE><HEADERFILE>sd.h</HEADERFILE><HEADERFILE>pins.h</HEADERFILE><HEADERFILE>config.h</HEADERFILE><HEADERFILE>tlc.h</HEADERFILE><HEADERFILE>buffer.h</HEADERFILE><HEADERFILE>dmx.h</HEADERFILE><HEADERFILE>mcu.h</HEADERFILE><HEADERFILE>mcu_atmega8.h</HEADERFILE><HEADERFILE>pins_atmega8.h</HEADERFILE><HEADERFILE>sched.h</HEADERFILE><OTHERFILE>Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega8</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>dmxpainter.elf</OUTPUTFILENAME><OUTPUTDIR>bin\</OUTPUTDIR><ISDIRTY>1</ISDIRTY><OPTIONS><OPTION><FILE>buffer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>sd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>tlc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>tlc_isr.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2     -std=c99      -DF_CPU=16000000UL -O1 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20080610\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20080610\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/><sort sorted="0" column="0" ordername="0" orderaddress="0" ordergroup="0"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>tlc.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>sched.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>dmx.c</FileName><Status>257</Status></File00003><File00004><FileId>00004</FileId><FileName>pins.h</FileName><Status>1</Status></File00004><File00005><FileId>00005</FileId><FileName>mcu_atmega8.h</FileName><Status>1</Status></File00005><File00006><FileId>00006</FileId><FileName>buffer.c</FileName><Status>1</Status></File00006><File00007><FileId>00007</FileId><FileName>config.h</FileName><Status>1</Status></File00007><File00008><FileId>00008</FileId><FileName>tlc.h</FileName><Status>1</Status></File00008><File00009><FileId>00009</FileId><FileName>bits.h</FileName><Status>1</Status></File00009></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>\r
index 979d3f9..5dbd92d 100644 (file)
@@ -7,8 +7,6 @@
 \r
 //#include <util/atomic.h>\r
 \r
-#include "config.h"\r
-\r
 #include "mcu.h"\r
 \r
 #include "sched.h"\r
index 8ce4a8b..201aa81 100644 (file)
--- a/src/mcu.h
+++ b/src/mcu.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "pins.h"
+
+#include "mcu_config.h"
+
 #ifdef __AVR_ATmega8__
 #include "mcu_atmega8.h"
 #else
index 61b1e00..725870c 100644 (file)
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "pins.h"
-
 #define mcu_set_timer0_cnt(v) TCNT0 = v
 
 #define mcu_set_timer1_cnt(v)  TCNT1 = v
similarity index 100%
rename from src/config.h
rename to src/mcu_config.h
index 64d1b1e..e00b6e9 100644 (file)
--- a/src/tlc.c
+++ b/src/tlc.c
@@ -2,8 +2,6 @@
 \r
 #include "tlc.h"\r
 \r
-#include "config.h"\r
-\r
 #include "mcu.h"\r
 #include "pins.h"\r
 \r
index 88ed774..c427ff5 100644 (file)
--- a/src/tlc.h
+++ b/src/tlc.h
@@ -3,7 +3,7 @@
 \r
 #include <inttypes.h>\r
 \r
-#include "config.h"\r
+#include "mcu_config.h"\r
 \r
 #define N_RGB_CHANNELS (16 * N_PAINTER)\r
 #define N_TLC_CHANNELS (N_RGB_CHANNELS * 3)\r