Subversion Repositories BL-Ctrl

Compare Revisions

Ignore whitespace Rev 30 → Rev 31

/branches/v0.31_8kHz_PWM/main.elf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/v0.31_8kHz_PWM/avr.opm
File deleted
/branches/v0.31_8kHz_PWM/main.lss
File deleted
/branches/v0.31_8kHz_PWM/main.sym
File deleted
/branches/v0.31_8kHz_PWM/avr.mak
File deleted
/branches/v0.31_8kHz_PWM/BrushLess-Ctrl_V0_31.hex
File deleted
/branches/v0.31_8kHz_PWM/BrushLess-Ctrl_V0_31.eep
File deleted
/branches/v0.31_8kHz_PWM/avr_ctrl.psp
File deleted
/branches/v0.31_8kHz_PWM/main.map
File deleted
/branches/v0.31_8kHz_PWM/BLMC.h
12,17 → 12,17
void Manuell(void);
 
#ifdef _32KHZ
#define PWM_C_ON {TCCR1A = 0xAD; TCCR2 = 0x49;DDRB = 0x0A;}
#define PWM_B_ON {TCCR1A = 0xAD; TCCR2 = 0x49;DDRB = 0x0C;}
#define PWM_A_ON {TCCR1A = 0xAD; TCCR2 = 0x69;DDRB = 0x08;}
#define PWM_OFF {TCCR1A = 0x0D; TCCR2 = 0x49;PORTC &= ~0x0E;}
#define PWM_C_ON {TCCR1A = 0xA1; TCCR2 = 0x49; DDRB = 0x0A;}
#define PWM_B_ON {TCCR1A = 0xA1; TCCR2 = 0x49; DDRB = 0x0C;}
#define PWM_A_ON {TCCR1A = 0xA1; TCCR2 = 0x69; DDRB = 0x08;}
#define PWM_OFF {TCCR1A = 0x01; TCCR2 = 0x49; PORTC &= ~0x0E;}
#endif
 
#ifdef _16KHZ
#define PWM_C_ON {TCCR1A = 0xA2; TCCR2 = 0x41; DDRB = 0x0A;}
#define PWM_B_ON {TCCR1A = 0xA2; TCCR2 = 0x41; DDRB = 0x0C;}
#define PWM_A_ON {TCCR1A = 0xA2; TCCR2 = 0x61; DDRB = 0x08;}
#define PWM_OFF {TCCR1A = 0x02; TCCR2 = 0x41;PORTC &= ~0x0E;}
#define PWM_C_ON {TCCR1A = 0xA1; TCCR2 = 0x41; DDRB = 0x0A;}
#define PWM_B_ON {TCCR1A = 0xA1; TCCR2 = 0x41; DDRB = 0x0C;}
#define PWM_A_ON {TCCR1A = 0xA1; TCCR2 = 0x61; DDRB = 0x08;}
#define PWM_OFF {TCCR1A = 0x01; TCCR2 = 0x41; PORTC &= ~0x0E;}
#endif
 
 
/branches/v0.31_8kHz_PWM/BrushLess-Ctrl_8kHz_PWM_V0_31.hex
0,0 → 1,292
:1000000012C070C52BC02AC0D2C5D5C427C026C017
:10001000C1C4FEC323C001C321C0CEC21FC01EC0C5
:1000200033C674C51BC011241FBECFE5D4E0DEBFAC
:10003000CDBF10E0A0E6B0E0E8E1F2E102C005903B
:100040000D92A037B107D9F713E0A0E7B0E001C0E7
:100050001D92A339B107E1F739D1DDC8D1CF209185
:10006000700080916400821710F4AB9A282F809161
:100070007200909173008338910560F01BBC1ABC2C
:1000800019BC18BC13BCAB9A019790937300809372
:1000900072000895822F99279BBD8ABD99BD88BDA6
:1000A00023BD089591E09FBD81E485BD85B3817F27
:1000B00085BB9EBD089592B7980F82B7891B87FDB7
:1000C000FCCF08958091780090917900892B09F0F8
:1000D0004EC080917A00882371F0909186008FEF56
:1000E000989FC001112468EC70E044D8709385009B
:1000F0006093840044C080919100882359F120913D
:100100008E0030918F0041E02D32340730F4293CCD
:10011000310540F42B30310538F4109285001092EF
:1001200084002CC028EC30E08CEF90E0AC01249FE0
:10013000C001259F900D349F900D1124885D99403A
:1001400064EB70E017D86D5F7F4F7093850060930C
:10015000840014C08091840090918500009729F05C
:1001600001979093850080938400AB9A08C080919A
:10017000880399279093850080938400AB988091A1
:100180008400909185008F3F910539F030F08FEF1A
:1001900090E090938500809384008091840099275B
:1001A00008958091720090917300909378038093EA
:1001B000770380917500992790937A038093790350
:1001C000809182009091830090937C0380937B03C5
:1001D00080918E0090918F0090937E0380937D0399
:1001E0000895AF92BF92CF92DF92EF92FF920F935A
:1001F0001F93CF93DF93182F10929900439885E0B7
:1002000090E0909371008093700029DFDAD488EC3D
:1002100090E05ED3C12FDD27D0937100C0937000B2
:100220008CE2A82E81E0B82EC12CD12CEE24FF2424
:1002300087010EC080916600882311F4C7D101C0E8
:10024000B8D284E638DF0894E11CF11C011D111DB1
:10025000EA14FB040C051D0569F7C601B5012FE082
:1002600030E040E050E09AD7A21AB30AC40AD50A97
:100270000894A108B108C108D10889E1A816B10401
:10028000C104D104C0F09DD4809197008F5F80930A
:1002900097008091970066E061D79093970033D3E1
:1002A000D0937100C0937000DADE449BBFCF82B35D
:1002B000805882BBBBCFDF91CF911F910F91FF90F0
:1002C000EF90DF90CF90BF90AF900895AF92BF9224
:1002D000CF92DF92EF92FF920F931F93CF93DF9312
:1002E00088E084BB85BB8AEB81BB80E882BB8EE063
:1002F00087BB81E388BB77D2CED2789486E990E041
:10030000E7D297988AEF90E0E3D2C0E0D0E0219660
:10031000C130D10549F4979A86E990E0D9D29798EF
:100320008AEF90E0D5D2F3CF86E990E0D1D29798CA
:100330008AEF90E0CDD2CE010196059744F384EF89
:1003400091E0C6D250D2AEDE80E5DBD316D385E68F
:1003500090E0AAD286E690E0A7D287E690E0A4D209
:10036000EC018EEF90E0A0D25C018DEE93E09CD288
:100370008C018EEE93E098D26C01CE019ED2882340
:10038000E1F3979A109271001092700068DE88E095
:1003900080BF81E087B98AE090E086D2EC0181E0FD
:1003A00090E090937A038093790310928F001092DB
:1003B0008E00EE2487DE9927909371008093700061
:1003C000809197008E1551F0109263001092620098
:1003D00082E390E069D2EC01E09097008091700098
:1003E00090917100892BC1F410927F0010926200ED
:1003F000C80163D28823D1F010929900439891E00C
:100400009093630082B3877C82BB9FBD81E485BDEE
:1004100085B3817F85BB0EC080916300882319F06E
:1004200081E080937F008CED95E03ED28091630067
:10043000882321F0109271001092700010DE8091DC
:1004400062008F5F80936200813009F0B3CF8091AA
:1004500063008111979AC50130D2882339F182E374
:1004600090E022D25C0180917500482F55272091A1
:100470007200309173004217530710F48F5F04C06D
:100480002417350718F4815080937500809175000A
:1004900090916400823428F0915090936400AB9A5C
:1004A00005C09F3F19F09F5F90936400C80105D27B
:1004B000882309F18AE090E0F7D18C012091800037
:1004C00030918100C901880F991F820F931F880FF7
:1004D000991F67E070E04ED67093830060938200AE
:1004E000109281001092800080919100882319F46D
:1004F00081E080936500C601E0D1882321F08CED76
:1005000095E0D2D16C01CE01D8D1882331F0809111
:10051000820090918300892B29F080917F008823AD
:1005200009F448CF21E0F22EF09263001092990076
:10053000439884E690E0B8D1EC0180917F00882355
:1005400009F438CFAB9810927F008AE04ADE979A80
:10055000109263008091970081508093970081E012
:1005600090E0909371008093700079DD88B18C7F6A
:1005700088B9F092990088B18A6088B984E690E0E1
:1005800093D1EC01CE0199D18823E1F38AE090E088
:10059000909371008093700062DD88EC90E084D1CC
:1005A000EC01CE018AD18823E1F388EE93E07CD17F
:1005B000EC0197E0E92EFECE1F920F920FB60F923C
:1005C00011240F900FBE0F901F9018955E9B24C0B2
:1005D000809166008823E1F48091890090918A00DF
:1005E000019690938A0080938900FC01E556FD4FA7
:1005F000E081ED3019F08436910539F410928A00CB
:100600001092890081E080936600589AECB90895B1
:1006100010928A001092890008951F920F920FB6CF
:100620000F9211248F938CB1809387008091870063
:10063000853F19F41092670014C0809167008F5FA6
:1006400080936700813041F4809187008093860019
:1006500088EC80937A0005C0853618F084E6809394
:1006600067008F910F900FBE0F901F901895DC01BF
:1006700020E030E040E050E0EBE9F2E005C081919D
:10068000280F311D4F5F5F4F4A175B07C1F73F705F
:10069000C90136E0969587953A95E1F7835CFD01AF
:1006A000E556FD4F808311962F73235CFD01E556BF
:1006B000FD4F2083A456BD4F8DE08C9310926600B1
:1006C00080919B028CB90895EF92FF920F931F9334
:1006D000CF93DF937A01722F93E290939B02609302
:1006E0009C0280939D0203E010E060E0AEE9B2E07E
:1006F00046C0F701E60FF11D90816F5F715019F44C
:10070000E0E040E00FC0F701E60FF11D40816F5FB0
:10071000715011F4E0E006C0F701E60FF11DE08131
:100720006F5F7150892F86958695835C8C935527D2
:10073000892F99278370907024E0880F991F2A953C
:10074000E1F79A0194E0369527959A95E1F7822B87
:10075000835CED0189834F705070440F551F440F27
:10076000551F8E2F8295869586958370842B835C8A
:100770008A83EF73E35CEB830C5F1F4F1496772340
:1007800009F0B7CFC80173DFDF91CF911F910F91AF
:10079000FF90EF9008951F93182F8A3011F48DE089
:1007A000FADF5D9BFECF1CB980E090E01F910895B9
:1007B00008958091FF02909100037FD0882391F0EB
:1007C00080916600882371F022E245E653E0609153
:1007D0009A0284E479DF82E390E066D0909300038C
:1007E0008093FF02089588E18AB9599A579A8CE05C
:1007F00089B960E070E08BEC93E04AD388EC90E03C
:1008000053D0909300038093FF028AE28CB908953D
:100810001F920F920FB60F9211248F939F938FE721
:1008200082BF809187038F5F8093870380918D00C3
:10083000815080938D008F3F39F583E080938D0048
:1008400080918B0090918C00019690938C00809306
:100850008B008091780090917900009729F00197A2
:10086000909379008093780080919100882329F0FB
:100870008091910081508093910080917A0088232B
:1008800019F0815080937A009F918F910F900FBE45
:100890000F901F90189582E083BF89B7816089BF50
:1008A00089B7806489BF089520918B0030918C00B6
:1008B000280F391FC9010197089520918B003091AD
:1008C0008C00821B930B892F992780789927089594
:1008D00020918B0030918C00280F391F215030401F
:1008E00080918B0090918C00A901481B590BCA0183
:1008F000892F992787FFF4CF089586EA86B987E084
:1009000087B9369A089527B196E097B910BE83ED5E
:1009100086B9349A97B9369A349BFECF27B944B139
:1009200055B1440F551F440F551F493C510510F058
:1009300048EC50E080917200909173009C0163E05C
:10094000220F331F6A95E1F7281B390B240F351F3F
:1009500083E0369527958A95E1F7309373002093CD
:1009600072008091740099278217930710F42093E6
:10097000740016B888E080BF08958EB5806C8EBD77
:100980008EB580648EBD89B7806289BF89B7846067
:1009900089BF08951F920F920FB60F9211248F9363
:1009A000809190008F5F809390008F910F900FBE89
:1009B0000F901F9018951F920F920FB60F9211244F
:1009C0002F933F934F935F938F939F930EB406FEA5
:1009D0000FC01092900086B597B5909395008093C4
:1009E00094008EB58F7B8EBD84E6809391006FC09E
:1009F0008EB580648EBD46B557B58091900020912C
:100A0000940030919500421B530B9927982F88270B
:100A1000990F990F480F591F689414F856954795E8
:100A20001694E1F7509393004093920081E048318F
:100A3000580758F4109293001092920080918E0003
:100A400090918F0040E050E013C0485151405093C6
:100A500093004093920080918E0090918F008417B4
:100A6000950730F480918E0090918F0001960CC014
:100A700080918E0090918F004817590748F480911B
:100A80008E0090918F00019790938F0080938E003D
:100A900080918E0090918F009C01220F331F220FB6
:100AA000331F220F331F281B390B240F351F83E000
:100AB000369527958A95E1F730939300209392001D
:100AC00030938F0020938E0081E0809365009F918A
:100AD0008F915F914F913F912F910F900FBE0F908B
:100AE0001F9018951F920F920FB60F9211248F939B
:100AF0008AB78F7B8ABF8F910F900FBE0F901F9088
:100B000018958E5F82B985EC86BF08951F920F926B
:100B10000FB60F9211248F939F9381B19927887FED
:100B2000907080389105C9F08138910534F40097B0
:100B300091F18036910591F50AC0883B9105B9F095
:100B4000883F910529F1883A910541F510C086B793
:100B5000806886BF1092960023C083B1809388037B
:100B600084EF91E090937900809378000EC080919B
:100B70009600882339F48091750083B981E08093D1
:100B8000960003C08091640083B986B7806807C06F
:100B900086B7806986BF86B7806986BF85EC86BFC9
:100BA0009F918F910F900FBE0F901F9018951F92DD
:100BB0000F920FB60F9211240F900FBE0F901F903F
:100BC000189590919700923041F1933030F4992329
:100BD00061F0913009F057C014C09430C1F19430E5
:100BE00040F1953009F04FC042C081EA8FBD81E6E7
:100BF00085BD88E087BB82B3877D82BB949A82E003
:100C000031C081EA8FBD81E685BD88E087BB82B3B4
:100C1000877E82BB959A97B918C081EA8FBD81E41F
:100C200085BD8CE087BB82B3877E82BB959A17B85F
:100C30001AC081EA8FBD81E485BD8CE087BB82B399
:100C40008F7C82BB939A82E087B94098089581EAAD
:100C50008FBD81E485BD8AE087BB82B38F7C82BB78
:100C6000939A81E087B988B1836088B9089581EA51
:100C70008FBD81E485BD8AE087BB82B3877D82BB5F
:100C8000949A17B8409808951F920F920FB60F923A
:100C900011240F931F932F933F934F935F936F9361
:100CA0007F938F939F93AF93BF93EF93FF9388B1FD
:100CB0009927689414F8969587951694E1F7082F6C
:100CC000017010919700123009F456C0133030F4BF
:100CD000112371F0113009F0BCC024C0143009F4A4
:100CE0007EC0143008F461C0153009F0B2C091C064
:100CF00081EA8FBD81E685BD88E087BB002369F06E
:100D000082B3877E82BB959A11E014BD8091650005
:100D10008111F9DD409817B91AC082B3877D82BB73
:100D2000949A97C082B3877E82BB959A0023F1F490
:100D300081EA8FBD81E485BD8CE087BB14BD8091C5
:100D400065008111E0DD17B888B1836088B98091B2
:100D500097008F5F80939700809180009091810031
:100D60000196909381008093800073C081EA8FBDCB
:100D700081E685BD88E06CC081EA8FBD81E485BDD8
:100D80008CE087BB002361F082B38F7C82BB939A97
:100D900081E084BD809165008111B5DD17B932C055
:100DA00082B3877E82BB959A54C082B38F7C82BB0C
:100DB000939A002371F481EA8FBD81E485BD8AE0B6
:100DC00087BB11E014BD8091650081119CDD17B9CE
:100DD000BBCF81EA8FBD81E485BD8CE039C081EA5B
:100DE0008FBD81E485BD8AE087BB002369F082B3B3
:100DF000877D82BB949A81E084BD809165008111DA
:100E000082DD17B84098A3CF82B38F7C82BB939AC0
:100E100020C082B3877D82BB949A0023A1F481EA2B
:100E20008FBD81E685BD88E087BB81E084BD809170
:100E30006500811168DD82E087B988B1836088B977
:100E40001092970089CF81EA8FBD81E485BD8AE049
:100E500087BB459903C0002309F029CF459B03C0F8
:100E6000002309F424CF10926500FF91EF91BF9108
:100E7000AF919F918F917F916F915F914F913F9132
:100E80002F911F910F910F900FBE0F901F901895EB
:100E9000EF92FF920F931F93CF93DF938C017B010F
:100EA000892B11F4672BC9F16EE070E081E090E0CE
:100EB0003BD0FC01009789F1DC0180E88383E114D9
:100EC000F10471F0F386E28681E8838380918903DF
:100ED00090918A03892B21F4F0938A03E09389038C
:100EE00001151105E1F011870087838182608383FA
:100EF00080918B0390918C03892B89F4F0938C0360
:100F0000E0938B0380918D0390918E03892B39F4AC
:100F1000F0938E03E0938D0302C0A0E0B0E0CD011A
:100F2000E6E0CDB7DEB768C10F931F93CF93DF9391
:100F3000869F8001879F100D969F100D1124C80178
:100F40000DD0EC01009721F0A80160E070E0FFD027
:100F5000CE01DF91CF911F910F910895CF93DF9331
:100F6000AC01029710F442E050E0A0919103B091DF
:100F70009203FD01C0E0D0E020E030E020C080819D
:100F800091818417950769F482819381209719F0E4
:100F90009B838A8304C09093920380939103CF0133
:100FA00032C04817590738F42115310519F0821756
:100FB000930708F49C01EF010280F381E02D309744
:100FC000F1F62115310589F1C901841B950B0497B0
:100FD00008F4A901E0E0F0E026C08D919C91119702
:100FE00082179307E9F44817590779F4ED018A81CC
:100FF0009B81309719F09383828304C0909392036E
:1010000080939103CD01029649C0841B950BFD018D
:10101000E80FF91F4193519302978D939C933AC027
:10102000FD01A281B3811097C1F680918F03909149
:101030009003892B41F480916B0090916C00909308
:10104000900380938F0320916D0030916E002115E5
:10105000310541F42DB73EB78091690090916A0047
:10106000281B390BE0918F03F09190032E1B3F0B4F
:101070002417350788F0CA0102962817390760F04F
:10108000CF01840F951F02969093900380938F0356
:1010900041935193CF0102C080E090E0DF91CF9166
:1010A0000895CF93DF93009709F44EC0EC01229787
:1010B0001B821A82A0919103B0919203109711F1B3
:1010C00040E050E001C0DC01AC17BD0700F1BB837C
:1010D000AA83FE0121913191E20FF31FEA17FB076A
:1010E00071F42E5F3F4F8D919C911197820F931F4A
:1010F00099838883FD01828193819B838A83411533
:10110000510559F4D0939203C09391031DC0FD0182
:1011100082819381AD010097B1F6FA01D383C28336
:1011200021913191E20FF31FEC17FD0769F42E5F57
:101130003F4F88819981820F931FFA0191838083A9
:101140008A819B8193838283DF91CF910895DC0113
:1011500001C06D9341505040E0F70895991B79E02C
:1011600004C0991F961708F0961B881F7A95C9F737
:1011700080950895AA1BBB1B51E107C0AA1FBB1F86
:10118000A617B70710F0A61BB70B881F991F5A9513
:10119000A9F780959095BC01CD010895A1E21A2E82
:1011A000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F0B
:1011B000A217B307E407F50720F0A21BB30BE40B5B
:1011C000F50B661F771F881F991F1A9469F76095A2
:1011D0007095809590959B01AC01BD01CF0108955C
:1011E0002A88398848885F846E847D848C849B84B7
:1011F000AA84B984C884DF80EE80FD800C811B81C5
:10120000AA81B981CE0FD11D0FB6F894DEBF0FBEF3
:08121000CDBFED010895FFCFF1
:101218000A000101FF01016464200093030000003B
:00000001FF
/branches/v0.31_8kHz_PWM/PPM_Decode.c
50,10 → 50,10
{
ICP_POS_FLANKE;
#ifdef _32KHZ
ppm = (ICR1 - tim_alt + (int) Timer1Overflow * 256) / 32;
ppm = (ICR1 - tim_alt + (int) Timer1Overflow * 512) / 32;
#endif
#ifdef _16KHZ
ppm = (ICR1 - tim_alt + (int) Timer1Overflow * 512) / 32;
ppm = (ICR1 - tim_alt + (int) Timer1Overflow * 1024) / 32;
#endif
if(ppm < 280) ppm = 280;
ppm -= 280;
/branches/v0.31_8kHz_PWM/avr.pjt
0,0 → 1,199
;Codewright Project File (do not remove or modify this line)
[ProjInit]
ConfigSetExtMode=2
ProjSetConfigFlags=0x04110940
 
[State]
SysSetCwd='C:\WinAVR\Projects\Flug\Flight-Ctrl_V0_22'
SrchSetFlags=0x0005600a
SrchSetAgainFlags=0x04056004,0
SrchSetAgainFlags=0x02056008,1
SrchSetAttrElements=
SrchSetAgainAttrElements=
FileSortMode=0x0
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.c',81,81,1058,605,-1,-1,29,16,2,1,12,'',0x00100008,0,80,0,0,'',0,12
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c',135,135,1058,605,-1,-1,276,8,254,1,3,'',0x00100008,0,80,0,0,'',0,3
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.c',0,0,1165,490,-1,-1,1,1,1,1,5,'',0x00100008,0,80,0,0,'',0,5
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.h',27,27,1165,490,-1,-1,46,1,26,1,9,'',0x00100008,0,80,0,0,'',0,9
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.c',135,135,1058,605,-1,-1,30,31,1,1,7,'',0x00100008,0,80,0,0,'',0,7
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.c',162,162,1058,605,-1,-1,117,1,104,1,8,'',0x00100008,0,80,0,0,'',0,8
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.h',189,189,1058,605,-1,-1,30,5,1,1,2,'',0x00100008,0,80,0,0,'',0,2
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\analog.h',216,216,1058,605,-1,-1,2,1,1,1,14,'',0x00100008,0,80,0,0,'',0,14
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h',243,243,1058,605,-1,-1,30,30,1,1,1,'',0x00100018,0,80,0,0,'',0,1
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\old_macros.h',270,270,1058,605,-1,-1,1,1,1,1,15,'',0x00100008,0,80,0,0,'',0,15
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.h',0,0,1058,605,-1,-1,13,9,1,1,10,'',0x00100008,0,80,0,0,'',0,10
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.h',54,54,1058,605,-1,-1,10,4,1,1,11,'',0x00100008,0,80,0,0,'',0,11
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.h',81,81,1058,605,-1,-1,1,1,1,1,16,'',0x00100008,0,80,0,0,'',0,16
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\makefile',108,108,1058,605,-1,-1,6,1,1,1,6,'',0x00100008,0,80,0,0,'',0,6
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.c',0,0,1058,605,-1,-1,161,1,139,1,4,'',0x00100008,0,80,0,0,'',0,4
_StateView='C:\WinAVR\Projects\Flug\BL_MC_0_27\analog.c',27,27,1058,605,-1,-1,30,48,1,1,13,'',0x00100008,0,80,0,0,'',0,13
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.c',0x0400048e,29,16,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c',0x0400048e,276,8,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.c',0x0000048e,1,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.h',0x0400048e,46,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.c',0x0400048e,30,31,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.c',0x0400048e,117,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.h',0x0400048e,30,5,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\analog.h',0x0400048e,2,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h',0x0c00048e,30,30,25,'5 9','',0x0,'',1,72,1,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\old_macros.h',0x0000048e,1,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.h',0x0400048e,13,9,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.h',0x0c00048e,10,4,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.h',0x0000048e,1,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\makefile',0x0400048e,6,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.c',0x0400048e,161,1,25,'5 9','',0x0,'',1,72,0,0,''
_StateBuffer='C:\WinAVR\Projects\Flug\BL_MC_0_27\analog.c',0x0c00048e,30,48,25,'5 9','',0x0,'',1,72,0,0,''
_StateHistory=FILELIST,'C:\WinAVR\Projects\Flug\BL_MC_0_27\old_macros.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\printf_P.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\makefile','C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c','C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.c','C:\WinAVR\Projects\Flug\BL_MC_0_27\BLMC.h'
_StateHistory=SEARCH,'ClrSENSE()','GRUEN','MANUELL_PWM','ENABLE_SENSE_INT','ACSR','GRUE','MotorGestoppt','MotorAnwerfen','SIO_DEBUG','X3D_SIO'
_StateHistory=REPLACE,'DebugDisplayZeilenAnforderung','SollPeriodendauer','TestschubTimer','SENSE_h','SENSE_L','SENSE_H','SENSE__FALLING_INT','SENSE_RISING_INT','SENSE_FALLING_INT'
_StateHistory=EDITFILE,'C:\WinAVR\Projects\Flug\BL_MC_0_27\PPM_Decode.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\printf_P.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\timer0.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\twislave.h','C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c','C:\WinAVR\Projects\Flug\BL_MC_0_27\makefile','C:\WinAVR\Projects\Flug\Flight-Ctrl_V0_05\AVR.pjt','C:\WinAVR\Projects\Flug\Flight-Ctrl_V0_06\Main.psp','C:\compiler\M16C\UniversalGateway\UN_DP_V1_25\m16C.psp','C:\WinAVR\Projects\Flug\Flight-Ctrl_V0_22\Main.psp'
_StateHistory=DOCUMENTVISIT,'14 18 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h','276 8 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c','15 16 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h','161 1 C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.c','33 5 C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.h','30 30 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h','33 5 C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.h','30 30 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.h','276 8 C:\WinAVR\Projects\Flug\BL_MC_0_27\main.c','33 5 C:\WinAVR\Projects\Flug\BL_MC_0_27\uart.h'
_StateDocumentVisit=10
 
[Editor]
_RestoreSysFlags=0x43097fca, 0xfffffffc, 0
FilterProjDeleteList
FilterProjAdd='Source Files','*.c;*.cc;*.cpp;*.cxx;*.ic;*.c96;*.fle;*.cmp;*.asm;*.src;*.s;*.a96;*.i;*.pcp',-1
FilterProjAdd='Header Files','*.h;*.inc;*.sfr',-1
FilterProjAdd='Project Files','*.pjt',-1
FilterProjAdd='Resources','*.rc;*.bmp;*.ico;*.cur;*.dlg',-1
FilterProjAdd='Other Files','*.*',-1
VCSProject=''
VCSProjectPath=''
VCSProjectLocalPath=''
ScrapSetCount=1
ClipboardSetCount=1
ClipboardEnableSepStr=1
ClipboardSetSepStr='\r\n',0
ClipboardEnableTermStr=1
ClipboardSetTermStr='\r\n',0
 
[Tools]
ToolDeleteList
ToolAddCmd='$_custom_tool_$_1','API Database Editor',1342177312,'cwtedit.exe'
ToolAddCmd='$_custom_tool_$_2','Paint',1342177713,'make.exe program'
ToolAddCmd='$_custom_tool_$_3','Build all',1342177680,'make.exe all'
ToolAddCmd='$_custom_tool_$_4','Bulid Clean',1342177680,'make.exe clean'
 
[Compiler]
CompilerAssign='TASKING src','.src'
CompilerNewExt=.htm
CompilerNewExt=.v
CompilerNewExt=.awk
CompilerNewExt=.bas
CompilerAssign='TASKING c','.c'
CompilerNewExt=.adb
CompilerNewExt=.cfml
CompilerNewExt=.jsp
CompilerNewExt=.pl
CompilerNewExt=.vhd
CompilerNewExt=.pas
CompilerNewExt=.tk
CompilerNewExt=.asp
CompilerNewExt=.rul
CompilerNewExt=.cob
CompilerNewExt=.js
CompilerNewExt=.php
CompilerNewExt=.rc
CompilerNewExt=.tcl
CompilerAssign='TASKING cc','.cc'
CompilerAssign='TASKING fle','.fle'
CompilerNewExt=.ini
CompilerAssign='TASKING ic','.ic'
CompilerNewExt=.cs
CompilerNewExt=.bat
CompilerNewExt=.html
CompilerAssign='TASKING cpp','.cpp'
CompilerAssign='TASKING cxx','.cxx'
CompilerAssign='TASKING asm','.asm'
CompilerNewExt=.txt
CompilerNewExt=.nrx
CompilerNewExt=.java
CompilerNewExt=.sqlj
CompilerNewExt=.xml
TagSetCmd='"${HOME}${WTAGS}" -oc -d -t"${TAGFILE}.tag" -p"${TAGFILE}.ptg"',0x8000060
BrowseSetFile='C:\Cw32_M16\tagfile.ptg'
TagSetFile='C:\Cw32_M16\tagfile.tag'
 
[VersionControl:PVCS]
VCSSetCmd=VCS_CHECKIN_ID,'put -n -T@"%Q" -M@"%Q" "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKINLOCK_ID,'put -n -T@"%Q" -M@"%Q" -l "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKOUT_ID,'get -y "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKOUTLOCK_ID,'get -y -l "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKLOCK_ID,'vcs -y -l "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKUNLOCK_ID,'vcs -y -u "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKLABEL_ID,'vcs -y -v"${VCSLABEL}" "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKLOG_ID,'vlog "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKPROP_ID,'vlog -b "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKDIFF_ID,'vdiff -r "%b%e"',0x8000040
VCSSetCmd=VCS_CHECKMENU_ID,'pvcsvmwn',0x8000000
VCSSetCmd=VCS_ADD_ID,'vcs -i -t@"%Q" "%b%e"',0x8000040
VCSSetCmd=VCS_REMOVE_ID,'del /f "%b%{??v|___}e"',0x8000040
 
[Project]
ConfigSetUserMakefile=''
ConfigSetUserMakefileParser=''
ConfigSetUserMakefileTimeStamp=0
ConfigSetUserMakefileAutoSync=0
ConfigSetLinkDBFilename='C:\Cw32\cwright.ldb'
ConfigSetMarkDBFilename='C:\Cw32\cwright.mrk'
ConfigSetSymbolDBFilename='C:\WinAVR\Projects\Flug\BL_MC_0_01\avr.sbl'
EditSetPath=''
 
[Files]
.\uart.c
.\analog.c
.\interrupt4.c
.\main.c
.\PPM_Decode.c
.\printf_P.c
.\timer0.c
.\twislave.c
.\uart.h
.\analog.h
.\main.h
.\old_macros.h
.\PPM_Decode.h
.\printf_P.h
.\timer0.h
.\twislave.h
.\makefile
 
 
[Ede]
Toolchain=c:\c166\etc\c166.dol
ToolchainName=TASKING C for C166/ST10 v6.0 r4
ProjectDir=C:\WinAVR\Projects\Flug\BL_MC_0_27
UserMode=Expert
EdeVersion=2.7r5 (094)
CodeWrightVersion=7.0
DefBuildSettings=True
SaveFiles=True
ScanDependencies=False
StopAfterError=True
KeepTmpFiles=False
ExtMakefile=False
ExtMakefileName=
UseMakeOptions=False
MakeOptions=
ShowOptions=False
ExtDebugger=False
ExtDebuggerName=
UseDOSShell=False
SaveOptionMethod=0
SaveOptionFileName=
LoadOptionFileName=
LoadOptionStartup=False
GroupList=
 
[Directories]
Executables=c:\c166\bin
Includes=c:\c166\include
Libraries=c:\c166\lib
 
[DefaultOptions]
CpuRwdc=CpuRwdcDelay
OptionList=CpuRwdc
 
[Options]
FileList=
/branches/v0.31_8kHz_PWM/main.c
50,14 → 50,8
Strom--;
}
else
{
#ifdef _32KHZ
OCR1A = tmp_pwm; OCR1B = tmp_pwm; OCR2 = tmp_pwm;
#endif
 
#ifdef _16KHZ
OCR1A = 2 * (int)tmp_pwm; OCR1B = 2 * (int)tmp_pwm; OCR2 = tmp_pwm;
#endif
{
OCR1A = tmp_pwm; OCR1B = tmp_pwm; OCR2 = tmp_pwm;
}
}
 
67,8 → 61,16
//############################################################################
{
PWM_OFF;
TCCR1B = (1 << CS10) | (0 << CS11) | (0 << CS12) | (1 << WGM12) |
 
#ifdef _16KHZ
TCCR1B = (1 << CS10) | (0 << CS11) | (0 << CS12) | (0 << WGM12) |
(0 << WGM13) | (0<< ICES1) | (0 << ICNC1);
#endif
 
#ifdef _32KHZ
TCCR1B = (1 << CS10) | (0 << CS11) | (0 << CS12) | (1 << WGM12) |
(0 << WGM13) | (0<< ICES1) | (0 << ICNC1);
#endif
}
 
//############################################################################
307,10 → 309,10
switch(test)
{
case 0: PWM = 50; test++; break;
case 1: PWM = 130; test++; break;
case 2: PWM = 60; test++; break;
case 3: PWM = 140; test++; break;
case 4: PWM = 150; test = 0; break;
case 1: PWM = 60; test++; break;
case 2: PWM = 128; test++; break;
case 3: PWM = 200; test++; break;
case 4: PWM = 255; test = 0; break;
default: test = 0;
}
}
/branches/v0.31_8kHz_PWM/main.h
1,15 → 1,15
#ifndef _MAIN_H
#define _MAIN_H
 
#define MOTORADRESSE 4 // Adresse (1-4)
#define MOTORADRESSE 1 // Adresse (1-4)
#define MANUELL_PWM 0 // zur manuellen Vorgabe der PWM Werte: 0-255
#define TEST_MANUELL 0 // zum Testen der Hardware ohne Kommutierungsdetektion Werte: 0-255 (PWM)
#define TEST_SCHUB 0 // Erzeugt ein Schubmuster Werte: 0 = normal 1 = Test
#define POLANZAHL 12 // Anzahl der Pole (Magnete) Wird nur zur Drehzahlausgabe über Debug gebraucht
#define POLANZAHL 14 // Anzahl der Pole (Magnete) Wird nur zur Drehzahlausgabe über Debug gebraucht
#define MAX_PWM 255
#define MIN_PWM 3
#define MIN_PPM 10 // ab hier (PPM-Signal) schaltet der Regler erst ein
#define FILTER_PPM 7 // wie stark soll das PPM-Signal gefiltert werden (Werte: 0-30)?
#define FILTER_PPM 7 // wie stark soll das PPM-Signal gefiltert werden (Werte: 0-30)?
 
#define SIO_DEBUG 0 // Testwertausgaben auf der seriellen Schnittstelle
#define X3D_SIO 1 // serielles Protokoll des X3D (38400Bd) Achtung: dann muss SIO_DEBUG = 0 sein
29,7 → 29,7
#define LIMIT_STROM 50 // ab ca. 5,0A PWM begrenzen
#endif
 
#define SYSCLK 8000000L //Quarz Frequenz in Hz
#define SYSCLK 4000000L //Quarz Frequenz in Hz
 
 
//Robbe Roxxy 2824-34 mit Todd 10x4,5 bei 16kHz
/branches/v0.31_8kHz_PWM/makefile
10,7 → 10,7
FORMAT = ihex
 
# Target file name (without extension).
TARGET = BrushLess-Ctrl_V$(HAUPT_VERSION)_$(NEBEN_VERSION)
TARGET = BrushLess-Ctrl_8kHz_PWM_V$(HAUPT_VERSION)_$(NEBEN_VERSION)
 
# Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization.
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
/branches/v0.31_8kHz_PWM/timer0.c
20,6 → 20,7
SIGNAL(SIG_OVERFLOW0)
{
static unsigned char cnt;
TCNT0 = 0x7F;
Timer0Overflow++;
if(!cnt--)
{
/branches/v0.31_8kHz_PWM/uart.c
164,7 → 164,13
// UCSRB |= (1<<TXCIE);
 
//Teiler wird gesetzt
UBRR= (SYSCLK / (BAUD_RATE * 8L) -1 );
//UBRR= (SYSCLK / (BAUD_RATE * 8L) -1 );
#if X3D_SIO == 1
UBRR = 12; //38400 Baud @ 4 MHz
#else
UBRR = 8; //57600 Baud @ 4 MHz
#endif
//öffnet einen Kanal für printf (STDOUT)
fdevopen (uart_putchar, NULL);
Debug_Timer = SetDelay(200);