wn/newcar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPI and GPIO settings adjusted according to working ttt2 project, still not working

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-04-01 15:14:22 +02:00
parent f315ddaf09
commit ce5fefe33d
13 changed files with 1012 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Debug/my_src/main2.d
View File

@ -21,7 +21,8 @@ my_src/main2.o: ../my_src/main2.c \
../system/include/stm32f1xx/stm32f1xx_hal_flash.h \ ../system/include/stm32f1xx/stm32f1xx_hal_flash.h \
../system/include/stm32f1xx/stm32f1xx_hal_flash_ex.h \ ../system/include/stm32f1xx/stm32f1xx_hal_flash_ex.h \
../system/include/stm32f1xx/stm32f1xx_hal_pwr.h \ ../system/include/stm32f1xx/stm32f1xx_hal_pwr.h \
../system/include/stm32f1xx/stm32f1xx_hal_spi.h ../my_src/led.h ../system/include/stm32f1xx/stm32f1xx_hal_spi.h ../my_src/led.h \
../my_src/oled.h
/home/wn/workspace-stm32/newcar/hottislib/PontCoopScheduler.h: /home/wn/workspace-stm32/newcar/hottislib/PontCoopScheduler.h:
@ -72,3 +73,5 @@ my_src/main2.o: ../my_src/main2.c \
../system/include/stm32f1xx/stm32f1xx_hal_spi.h: ../system/include/stm32f1xx/stm32f1xx_hal_spi.h:
../my_src/led.h: ../my_src/led.h:
../my_src/oled.h:

BIN
Debug/my_src/main2.o
View File

Binary file not shown.

73
Debug/my_src/oled.d Normal file
View File

@ -0,0 +1,73 @@
my_src/oled.o: ../my_src/oled.c ../my_src/oled.h ../my_src/oled-fonts.h \
../system/include/stm32f1xx/stm32f1xx_hal.h \
../include/stm32f1xx_hal_conf.h ../include/mxconstants.h \
../system/include/stm32f1xx/stm32f1xx_hal_rcc.h \
../system/include/stm32f1xx/stm32f1xx_hal_def.h \
../system/include/cmsis/device/stm32f1xx.h \
../system/include/cmsis/device/stm32f103xe.h \
../system/include/cmsis/core_cm3.h \
../system/include/cmsis/core_cmInstr.h \
../system/include/cmsis/cmsis_gcc.h \
../system/include/cmsis/core_cmFunc.h \
../system/include/cmsis/device/system_stm32f1xx.h \
../system/include/stm32f1xx/Legacy/stm32_hal_legacy.h \
../system/include/stm32f1xx/stm32f1xx_hal_rcc_ex.h \
../system/include/stm32f1xx/stm32f1xx_hal_gpio.h \
../system/include/stm32f1xx/stm32f1xx_hal_gpio_ex.h \
../system/include/stm32f1xx/stm32f1xx_hal_dma.h \
../system/include/stm32f1xx/stm32f1xx_hal_dma_ex.h \
../system/include/stm32f1xx/stm32f1xx_hal_cortex.h \
../system/include/stm32f1xx/stm32f1xx_hal_flash.h \
../system/include/stm32f1xx/stm32f1xx_hal_flash_ex.h \
../system/include/stm32f1xx/stm32f1xx_hal_pwr.h \
../system/include/stm32f1xx/stm32f1xx_hal_spi.h
../my_src/oled.h:
../my_src/oled-fonts.h:
../system/include/stm32f1xx/stm32f1xx_hal.h:
../include/stm32f1xx_hal_conf.h:
../include/mxconstants.h:
../system/include/stm32f1xx/stm32f1xx_hal_rcc.h:
../system/include/stm32f1xx/stm32f1xx_hal_def.h:
../system/include/cmsis/device/stm32f1xx.h:
../system/include/cmsis/device/stm32f103xe.h:
../system/include/cmsis/core_cm3.h:
../system/include/cmsis/core_cmInstr.h:
../system/include/cmsis/cmsis_gcc.h:
../system/include/cmsis/core_cmFunc.h:
../system/include/cmsis/device/system_stm32f1xx.h:
../system/include/stm32f1xx/Legacy/stm32_hal_legacy.h:
../system/include/stm32f1xx/stm32f1xx_hal_rcc_ex.h:
../system/include/stm32f1xx/stm32f1xx_hal_gpio.h:
../system/include/stm32f1xx/stm32f1xx_hal_gpio_ex.h:
../system/include/stm32f1xx/stm32f1xx_hal_dma.h:
../system/include/stm32f1xx/stm32f1xx_hal_dma_ex.h:
../system/include/stm32f1xx/stm32f1xx_hal_cortex.h:
../system/include/stm32f1xx/stm32f1xx_hal_flash.h:
../system/include/stm32f1xx/stm32f1xx_hal_flash_ex.h:
../system/include/stm32f1xx/stm32f1xx_hal_pwr.h:
../system/include/stm32f1xx/stm32f1xx_hal_spi.h:

BIN
Debug/my_src/oled.o Normal file
View File

Binary file not shown.

9
Debug/my_src/subdir.mk
View File

@ -5,15 +5,18 @@
# Add inputs and outputs from these tool invocations to the build variables # Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \ C_SRCS += \
../my_src/led.c \ ../my_src/led.c \
../my_src/main2.c ../my_src/main2.c \
../my_src/oled.c
OBJS += \ OBJS += \
./my_src/led.o \ ./my_src/led.o \
./my_src/main2.o ./my_src/main2.o \
./my_src/oled.o
C_DEPS += \ C_DEPS += \
./my_src/led.d \ ./my_src/led.d \
./my_src/main2.d ./my_src/main2.d \
./my_src/oled.d
# Each subdirectory must supply rules for building sources it contributes # Each subdirectory must supply rules for building sources it contributes

BIN
Debug/newcar.elf
View File

Binary file not shown.

552
Debug/newcar.hex
View File

@ -1,23 +1,23 @@
:020000040800F2 :020000040800F2
:1000000000C00020F9020008211800082518000887 :1000000000C00020F9020008E51A0008E91A0008FB
:10001000291800082D1800083118000800000000F9 :10001000ED1A0008F11A0008F51A000800000000A7
:10002000000000000000000000000000351800087B :10002000000000000000000000000000F91A0008B5
:1000300039180008000000003D18000841180008A9 :10003000FD1A000800000000011B0008051B000855
:10004000F5140008F5140008F5140008F51400086C :10004000AD170008AD170008AD170008AD17000880
:10005000F5140008F5140008F5140008F51400085C :10005000AD170008AD170008AD170008AD17000870
:10006000F5140008F5140008F5140008F51400084C :10006000AD170008AD170008AD170008AD17000860
:10007000F5140008F5140008F5140008F51400083C :10007000AD170008AD170008AD170008AD17000850
:10008000F5140008F5140008F5140008F51400082C :10008000AD170008AD170008AD170008AD17000840
:10009000F5140008F5140008F5140008F51400081C :10009000AD170008AD170008AD170008AD17000830
:1000A000F5140008F5140008F5140008F51400080C :1000A000AD170008AD170008AD170008AD17000820
:1000B000F5140008F5140008F5140008F5140008FC :1000B000AD170008AD170008AD170008AD17000810
:1000C000F5140008F5140008F5140008F5140008EC :1000C000AD170008AD170008AD170008AD17000800
:1000D000F5140008F5140008F5140008F5140008DC :1000D000AD170008AD170008AD170008AD170008F0
:1000E000F5140008F5140008F5140008F5140008CC :1000E000AD170008AD170008AD170008AD170008E0
:1000F000F5140008F5140008F5140008F5140008BC :1000F000AD170008AD170008AD170008AD170008D0
:10010000F5140008F5140008F5140008F5140008AB :10010000AD170008AD170008AD170008AD170008BF
:10011000F5140008F5140008F5140008F51400089B :10011000AD170008AD170008AD170008AD170008AF
:10012000F5140008F5140008F5140008F51400088B :10012000AD170008AD170008AD170008AD1700089F
:1001300000000000000000000000000000000000BF :1001300000000000000000000000000000000000BF
:1001400000000000000000000000000000000000AF :1001400000000000000000000000000000000000AF
:10015000000000000000000000000000000000009F :10015000000000000000000000000000000000009F
@ -29,21 +29,21 @@
:1001B000000000000000000000000000000000003F :1001B000000000000000000000000000000000003F
:1001C000000000000000000000000000000000002F :1001C000000000000000000000000000000000002F
:1001D000000000000000000000000000000000001F :1001D000000000000000000000000000000000001F
:1001E0005FF8E0F100B583B001F074F9304B314AAB :1001E0005FF8E0F100B583B001F0D0FA304B314A4E
:1001F0001360314A1360314B314A03E011681960D2 :1001F0001360314A1360314B314A03E011681960D2
:10020000043304322F498B42F8D32A4B1A682E4B01 :10020000043304322F498B42F8D32A4B1A682E4B01
:100210009A4204D1284B1A682C4B9A4200D0FEE730 :100210009A4204D1284B1A682C4B9A4200D0FEE730
:10022000234B2B4A13602B4A13602B4B02E0002216 :10022000234B2B4A13602B4A13602B4B02E0002216
:100230001A600433294A9342F9D3254B1B6813B93A :100230001A600433294A9342F9D3254B1B6813B93A
:10024000244B1B6803B1FEE701F050F9694601A891 :10024000244B1B6803B1FEE701F0ACFA694601A834
:1002500001F038F9224C234B1C1BA410002504E0AC :1002500001F094FA224C234B1C1BA410002504E04F
:100260001F4B53F8253098470135AC42F8DC1E4C43 :100260001F4B53F8253098470135AC42F8DC1E4C43
:100270001E4B1C1BA410002504E01B4B53F825301B :100270001E4B1C1BA410002504E01B4B53F825301B
:1002800098470135AC42F8DC0099019801F042FA38 :1002800098470135AC42F8DC0099019801F0A4FBD5
:100290000546174C174B1C1BA41004E0013C144BE3 :100290000546174C174B1C1BA41004E0013C144BE3
:1002A00053F824309847002CF8DC284601F008F970 :1002A00053F824309847002CF8DC284601F064FA13
:1002B000BABADECA000000201000002000000020B2 :1002B000BABADECA000000201000002000000020B2
:1002C000981A000814000020785634123254769898 :1002C000B82400081400002078563412325476986E
:1002D00014000020BC01002014000020C0010020F8 :1002D00014000020BC01002014000020C0010020F8
:1002E0009403000894030008940300089403000892 :1002E0009403000894030008940300089403000892
:1002F000940300089403000808B5FFF773FF00BFDC :1002F000940300089403000808B5FFF773FF00BFDC
@ -54,64 +54,64 @@
:100340000880EFF309807146074A104700BEFEE7B8 :100340000880EFF309807146074A104700BEFEE7B8
:1003500000BEFEE700BEFEE700BEFEE770470000FD :1003500000BEFEE700BEFEE700BEFEE770470000FD
:0C03600019030008350300084D030008D5 :0C03600019030008350300084D030008D5
:10036C00981A00080000002014000020981A0008B9 :10036C00B82400080000002014000020B824000865
:10037C00000000000000000014000020C00100205C :10037C00000000000000000014000020C00100205C
:08038C00000000000000000069 :08038C00000000000000000069
:1003940010B5044600F0C4FF064BA3FB00308009EF :1003940010B5044600F0C4FF064BA3FB00308009EF
:1003A40000F098F8002221464FF0FF3000F050F89A :1003A40000F098F8002221464FF0FF3000F050F89A
:1003B400002010BDD34D621008B5074A136843F0FE :1003B400002010BDD34D621008B5074A136843F0FE
:1003C40010031360032000F025F80020FFF7E0FF7E :1003C40010031360032000F025F80020FFF7E0FF7E
:1003D40001F0B0F9002008BD00200240024A136871 :1003D40001F012FB002008BD00200240024A13680D
:1003E40001331360704700BF18000020014B1868E8 :1003E40001331360704700BF18000020014B1868E8
:1003F400704700BF1800002010B582B00190FFF7CD :1003F400704700BF1800002010B582B00190FFF7CD
:10040400F5FF0446FFF7F2FF001B019B9842F9D366 :10040400F5FF0446FFF7F2FF001B019B9842F9D366
:1004140002B010BD10B50446C31E042B03D9BA2183 :1004140002B010BD10B50446C31E042B03D9BA2183
:10042400094801F085F9094AD36823F4E0631B0401 :10042400094801F0E7FA094AD36823F4E0631B049E
:100434001B0C240204F4E064234343F0BF6343F43D :100434001B0C240204F4E064234343F0BF6343F43D
:100444000033D36010BD00BFB819000800ED00E010 :100444000033D36010BD00BFB41D000800ED00E010
:1004540070B504460E4615460F2A03D9D2211A4810 :1004540070B504460E4615460F2A03D9D2211A4810
:1004640001F066F90F2E03D9D321174801F060F982 :1004640001F0C8FA0F2E03D9D321174801F0C2FABC
:10047400164BDA68C2F30222C2F10701042928BF2D :10047400164BDA68C2F30222C2F10701042928BF2D
:100484000421131D062B01D9033A00E000220123A5 :100484000421131D062B01D9033A00E000220123A5
:1004940003FA01F101393140914003FA02F2013AC1 :1004940003FA01F101393140914003FA02F2013AC1
:1004A4002A400A43002C06DA04F00F041201D2B2E7 :1004A4002A400A43002C06DA04F00F041201D2B2E7
:1004B400074B1A5570BD1201D2B204F1604404F521 :1004B400074B1A5570BD1201D2B204F1604404F521
:1004C400614484F8002370BDB819000800ED00E011 :1004C400614484F8002370BDB41D000800ED00E011
:1004D40014ED00E00138B0F1807F0AD2064B586079 :1004D40014ED00E00138B0F1807F0AD2064B586079
:1004E400F021064A82F823100020986007221A603F :1004E400F021064A82F823100020986007221A603F
:1004F40070470120704700BF10E000E000ED00E00D :1004F40070470120704700BF10E000E000ED00E00D
:1005040010B50446042805D020B14FF4DF71084823 :1005040010B50446042805D020B14FF4DF71084823
:1005140001F00EF9042C05D1064A136843F00403D4 :1005140001F070FA042C05D1064A136843F0040371
:10052400136010BD034A136823F00403136010BD65 :10052400136010BD034A136823F00403136010BD65
:10053400B819000810E000E008B501F0A3F908BDFF :10053400B41D000810E000E008B501F005FB08BD9B
:100544002DE9F04383B080460F46B54B98421BD04B :100544002DE9F04383B080460F46B54B98421BD04B
:1005540003F58063984217D003F58063984213D063 :1005540003F58063984217D003F58063984213D063
:1005640003F5806398420FD003F5806398420BD063 :1005640003F5806398420FD003F5806398420BD063
:1005740003F58063984207D003F58063984203D063 :1005740003F58063984207D003F58063984203D063
:10058400CF21A84801F0D4F83B881BB9D021A54855 :10058400CF21A84801F036FA3B881BB9D021A548F1
:1005940001F0CEF87B68012B22D9112B20D0022B3D :1005940001F030FA7B68012B22D9112B20D0022BD9
:1005A4001ED0122B1CD0A04A934219D002F58012FF :1005A4001ED0122B1CD0A04A934219D002F58012FF
:1005B400934215D002F58012934211D0A2F5F8129D :1005B400934215D002F58012934211D0A2F5F8129D
:1005C40093420DD002F58012934209D002F58012B5 :1005C40093420DD002F58012934209D002F58012B5
:1005D400934205D0032B03D0D121924801F0A8F80F :1005D400934205D0032B03D0D121924801F00AFAAB
:1005E4004FF000094E463FE10125B5403C682C40E0 :1005E4004FF000094E463FE10125B5403C682C40E0
:1005F400A54240F038818A4B98451BD003F58063AF :1005F400A54240F038818A4B98451BD003F58063AF
:10060400984517D003F58063984513D003F58063AC :10060400984517D003F58063984513D003F58063AC
:1006140098450FD003F5806398450BD003F58063AC :1006140098450FD003F5806398450BD003F58063AC
:10062400984507D003F58063984503D0DF217D48C2 :10062400984507D003F58063984503D0DF217D48C2
:1006340001F07EF87B68122B49D00CD8022B3AD0FB :1006340001F0E0F97B68122B49D00CD8022B3AD098
:1006440004D8002B4FD0012B1ED067E0032B60D0C1 :1006440004D8002B4FD0012B1ED067E0032B60D0C1
:10065400112B24D062E0754A934244D008D8A2F505 :10065400112B24D062E0754A934244D008D8A2F505
:10066400801293423FD002F58032934256D13AE051 :10066400801293423FD002F58032934256D13AE051
:100674006F4A934237D002F58032934233D0A2F5C9 :100674006F4A934237D002F58032934233D0A2F5C9
:10068400801293424AD12EE0FB68013B022B03D92E :10068400801293424AD12EE0FB68013B022B03D92E
:10069400E721644801F04CF8D7F80C903EE0FB6881 :10069400E721644801F0AEF9D7F80C903EE0FB681E
:1006A400013B022B03D9EE215E4801F041F8FB68BF :1006A400013B022B03D9EE215E4801F0A3F9FB685C
:1006B40003F1040932E0FB68013B022B03D9F52165 :1006B40003F1040932E0FB68013B022B03D9F52165
:1006C400584801F035F8FB6803F1080926E0FB6897 :1006C400584801F097F9FB6803F1080926E0FB6834
:1006D400013B022B03D9FC21524801F029F8FB68A5 :1006D400013B022B03D9FC21524801F08BF9FB6842
:1006E40003F10C091AE0BB68022B04D940F209118A :1006E40003F10C091AE0BB68022B04D940F209118A
:1006F4004C4801F01DF8BB6873B1012B04D1C8F854 :1006F4004C4801F07FF9BB6873B1012B04D1C8F8F1
:1007040010504FF0080909E0C8F814504FF00809D8 :1007040010504FF0080909E0C8F814504FF00809D8
:1007140004E04FF0000901E04FF00409FF2C01D878 :1007140004E04FF0000901E04FF00409FF2C01D878
:10072400404601E008F10400FF2C01D8B30002E0C8 :10072400404601E008F10400FF2C01D8B30002E0C8
@ -130,22 +130,22 @@
:1007F40013607B6813F4003F04D0104A536823430A :1007F40013607B6813F4003F04D0104A536823430A
:10080400536004E00D4A536823EA040353607B6891 :10080400536004E00D4A536823EA040353607B6891
:1008140013F4801F14D0094A93682343936014E0AF :1008140013F4801F14D0094A93682343936014E0AF
:1008240000080140E8190008000011100000211020 :1008240000080140E41D0008000011100000211020
:10083400000031100010024000000140000401409B :10083400000031100010024000000140000401409B
:100844000C4A936823EA040393607B6813F4001F43 :100844000C4A936823EA040393607B6813F4001F43
:1008540004D0084AD3681C43D46004E0054AD36832 :1008540004D0084AD3681C43D46004E0054AD36832
:1008640023EA0404D46001360F2E7FF6BDAE03B034 :1008640023EA0404D46001360F2E7FF6BDAE03B034
:10087400BDE8F0830004014070B5064615460C46F9 :10087400BDE8F0830004014070B5064615460C46F9
:1008840021B94FF4F271084800F052FF012D04D948 :1008840021B94FF4F271084801F0B4F8012D04D9EC
:1008940040F2E511044800F04BFF0DB1346170BD26 :1008940040F2E511044801F0ADF80DB1346170BDCA
:1008A4002404346170BD00BFE819000838B504465B :1008A4002404346170BD00BFE41D000838B504465B
:1008B4000D4621B94FF4FD71034800F039FFE1689A :1008B4000D4621B94FF4FD71034801F09BF8E1683E
:1008C4006940E16038BD00BFE819000830B583B065 :1008C4006940E16038BD00BFE41D000830B583B065
:1008D400044620B94FF48771B94800F029FF236812 :1008D400044620B94FF48771B94801F08BF82368B6
:1008E4003BB113F00F0F04D140F20F11B44800F0E4 :1008E4003BB113F00F0F04D140F20F11B44801F0E3
:1008F4001FFF236813F0010F00F0A380636853B156 :1008F40081F8236813F0010F00F0A380636853B1FB
:10090400B3F5803F07D0B3F5A02F04D040F2151102 :10090400B3F5803F07D0B3F5A02F04D040F2151102
:10091400AB4800F00DFFAB4B5B6803F00C03042BFA :10091400AB4801F06FF8AB4B5B6803F00C03042B9E
:100924000AD0A84B5B6803F00C03082B1BD1A54B22 :100924000AD0A84B5B6803F00C03082B1BD1A54B22
:100934005B6813F4803F16D04FF4003393FAA3F3AB :100934005B6813F4803F16D04FF4003393FAA3F3AB
:10094400A04B1A684FF4003393FAA3F3B3FA83F37A :10094400A04B1A684FF4003393FAA3F3B3FA83F37A
@ -165,8 +165,8 @@
:100A240093FAA3F3674B1A684FF4003393FAA3F3D2 :100A240093FAA3F3674B1A684FF4003393FAA3F3D2
:100A3400B3FA83F303F01F0322FA03F313F0010F55 :100A3400B3FA83F303F01F0322FA03F313F0010F55
:100A4400E6D1236813F0020F00F0A0802369012B84 :100A4400E6D1236813F0020F00F0A0802369012B84
:100A540004D940F249115A4800F06AFE63691F2B19 :100A540004D940F249115A4800F0CCFF63691F2BB6
:100A640004D94FF4A571564800F062FE554B5B68FB :100A640004D94FF4A571564800F0C4FF554B5B6898
:100A740013F00C0F0AD0534B5B6803F00C03082BE4 :100A740013F00C0F0AD0534B5B6803F00C03082BE4
:100A840027D1504B5B6813F4803F22D1022393FAA1 :100A840027D1504B5B6813F4803F22D1022393FAA1
:100A9400A3F34C4B1A68022393FAA3F3B3FA83F338 :100A9400A3F34C4B1A68022393FAA3F3B3FA83F338
@ -186,9 +186,9 @@
:100B7400144B1A68022393FAA3F3B3FA83F303F032 :100B7400144B1A68022393FAA3F3B3FA83F303F032
:100B84001F0322FA03F313F0010FE8D1236813F0D3 :100B84001F0322FA03F313F0010FE8D1236813F0D3
:100B9400080F5CD0A369012B04D94FF4C571084830 :100B9400080F5CD0A369012B04D94FF4C571084830
:100BA40000F0C6FDA3696BB3012292FAA2F3B3FA73 :100BA40000F028FFA3696BB3012292FAA2F3B3FA0F
:100BB40083F3054941F82320FFF718FC05460BE0B1 :100BB40083F3054941F82320FFF718FC05460BE0B1
:100BC4002C1A00080010024080044242FFF70EFC79 :100BC400281E00080010024080044242FFF70EFC79
:100BD400401B022800F2EF81022393FAA3F293FA56 :100BD400401B022800F2EF81022393FAA3F293FA56
:100BE400A3F2A44A526A93FAA3F3B3FA83F303F089 :100BE400A3F2A44A526A93FAA3F3B3FA83F303F089
:100BF4001F0322FA03F313F0010FE7D00120FFF7DC :100BF4001F0322FA03F313F0010FE7D00120FFF7DC
@ -198,7 +198,7 @@
:100C340093FAA3F28F4A526A93FAA3F3B3FA83F3B3 :100C340093FAA3F28F4A526A93FAA3F3B3FA83F3B3
:100C440003F01F0322FA03F313F0010FE7D1236823 :100C440003F01F0322FA03F313F0010FE7D1236823
:100C540013F0040F00F0AB80E368012B06D9052BD9 :100C540013F0040F00F0AB80E368012B06D9052BD9
:100C640004D040F2B711854800F062FD814BDA6987 :100C640004D040F2B711854800F0C4FE814BDA6924
:100C740042F08052DA61DB6903F080530193019BF7 :100C740042F08052DA61DB6903F080530193019BF7
:100C84007F4A136843F480731360FFF7AFFB054694 :100C84007F4A136843F480731360FFF7AFFB054694
:100C940005E0FFF7ABFB401B642800F29081784B22 :100C940005E0FFF7ABFB401B642800F29081784B22
@ -219,25 +219,25 @@
:100D84005B0943F00203DBB2022B02D1394B1A6A2E :100D84005B0943F00203DBB2022B02D1394B1A6A2E
:100D940001E0384B5A6A022393FAA3F3B3FA83F3BC :100D940001E0384B5A6A022393FAA3F3B3FA83F3BC
:100DA40003F01F0322FA03F313F0010FD9D1E3690F :100DA40003F01F0322FA03F313F0010FD9D1E3690F
:100DB400022B04D940F24721304800F0B9FCE36922 :100DB400022B04D940F24721304800F01BFEE369BE
:100DC400002B00F002812B4A526802F00C02082A20 :100DC400002B00F002812B4A526802F00C02082A20
:100DD40000F0FD80022B40F0B780236A3BB1B3F5ED :100DD40000F0FD80022B40F0B780236A3BB1B3F5ED
:100DE400803F04D04FF41471244800F0A1FC636ADE :100DE400803F04D04FF41471244800F003FE636A7A
:100DF40073B3B3F5802F2BD0B3F5002F28D0B3F500 :100DF40073B3B3F5802F2BD0B3F5002F28D0B3F500
:100E0400402F25D0B3F5801F22D0B3F5A01F1FD0EB :100E0400402F25D0B3F5801F22D0B3F5A01F1FD0EB
:100E1400B3F5C01F1CD0B3F5E01F19D0B3F5001F04 :100E1400B3F5C01F1CD0B3F5E01F19D0B3F5001F04
:100E240016D0B3F5101F13D0B3F5201F10D0B3F5AF :100E240016D0B3F5101F13D0B3F5201F10D0B3F5AF
:100E3400301F0DD0B3F5401F0AD0B3F5501F07D0B3 :100E3400301F0DD0B3F5401F0AD0B3F5501F07D0B3
:100E4400B3F5601F04D040F251210C4800F070FC4F :100E4400B3F5601F04D040F251210C4800F0D2FDEC
:100E54004FF0807393FAA3F3B3FA83F39B0003F187 :100E54004FF0807393FAA3F3B3FA83F39B0003F187
:100E6400844303F5840300221A60FFF7BFFA0546A2 :100E6400844303F5840300221A60FFF7BFFA0546A2
:100E74000EE000BF00100240800442422C1A000819 :100E74000EE000BF0010024080044242281E000819
:100E840000700040FFF7B2FA401B022800F2A18074 :100E840000700040FFF7B2FA401B022800F2A18074
:100E94004FF0007393FAA3F3514B1A684FF00073A9 :100E94004FF0007393FAA3F3514B1A684FF00073A9
:100EA40093FAA3F3B3FA83F303F01F0322FA03F3D1 :100EA40093FAA3F3B3FA83F303F01F0322FA03F3D1
:100EB40013F0010FE6D1236AB3F5803F10D1A36884 :100EB40013F0010FE6D1236AB3F5803F10D1A36884
:100EC4003BB1B3F5003F04D040F26721454800F040 :100EC4003BB1B3F5003F04D040F26721454800F040
:100ED4002FFC43494B6823F40032A36813434B604F :100ED40091FD43494B6823F40032A36813434B60EC
:100EE4003F48436823F47411236A626A13430B4333 :100EE4003F48436823F47411236A626A13430B4333
:100EF40043604FF0807393FAA3F3B3FA83F39B0038 :100EF40043604FF0807393FAA3F3B3FA83F39B0038
:100F040003F1844303F5840301221A60FFF76EFAA8 :100F040003F1844303F5840301221A60FFF76EFAA8
@ -254,7 +254,7 @@
:100FB40014E0032012E0032010E003200EE00320DD :100FB40014E0032012E0032010E003200EE00320DD
:100FC4000CE003200AE0032008E0002006E00120F2 :100FC4000CE003200AE0032008E0002006E00120F2
:100FD40004E0032002E0032000E0032003B030BD5E :100FD40004E0032002E0032000E0032003B030BD5E
:100FE400001002402C1A000830B486B01F4D02AC29 :100FE40000100240281E000830B486B01F4D02AC29
:100FF40028686968AA68EB680FC42B8AADF80430C6 :100FF40028686968AA68EB680FC42B8AADF80430C6
:101004001B4B5B6803F00C02082A2AD103F470110D :101004001B4B5B6803F00C02082A2AD103F470110D
:101014004FF4701292FAA2F2B2FA82F221FA02F2B8 :101014004FF4701292FAA2F2B2FA82F221FA02F2B8
@ -262,19 +262,19 @@
:101034005B6803F400314FF4003393FAA3F3B3FA7B :101034005B6803F400314FF4003393FAA3F3B3FA7B
:1010440083F321FA03F306A90B4413F8140C094B98 :1010440083F321FA03F306A90B4413F8140C094B98
:10105400B3FBF0F000FB02F004E0074800FB02F0F1 :10105400B3FBF0F000FB02F004E0074800FB02F0F1
:1010640000E0044806B030BC704700BF181A0008FE :1010640000E0044806B030BC704700BF141E0008FE
:101074000010024000127A0000093D0070B50D46D0 :101074000010024000127A0000093D0070B50D46D0
:10108400044620B94FF42F71A04800F051FB2368A7 :10108400044620B94FF42F71A04800F0B3FC236844
:1010940013F00F0F04D140F2BD219C4800F048FB2F :1010940013F00F0F04D140F2BD219C4800F0AAFCCC
:1010A400022D04D940F2BE21984800F041FB984B30 :1010A400022D04D940F2BE21984800F0A3FC984BCD
:1010B4001B6803F007039D420BD9954A136823F07C :1010B4001B6803F007039D420BD9954A136823F07C
:1010C40007032B431360136803F007039D4240F0AA :1010C40007032B431360136803F007039D4240F0AA
:1010D4000D81236813F0020F1DD0A368A3B1802BE8 :1010D4000D81236813F0020F1DD0A368A3B1802BE8
:1010E40012D0902B10D0A02B0ED0B02B0CD0C02B34 :1010E40012D0902B10D0A02B0ED0B02B0CD0C02B34
:1010F4000AD0D02B08D0E02B06D0F02B04D040F23D :1010F4000AD0D02B08D0E02B06D0F02B04D040F23D
:10110400D721824800F014FB82494B6823F0F00297 :10110400D721824800F076FC82494B6823F0F00234
:10111400A36813434B60236813F0010F00F0818030 :10111400A36813434B60236813F0010F00F0818030
:101124006368022B04D940F2DE21784800F000FB0A :101124006368022B04D940F2DE21784800F062FCA7
:101134006268012A13D14FF4003393FAA3F3754B79 :101134006268012A13D14FF4003393FAA3F3754B79
:1011440019684FF4003393FAA3F3B3FA83F303F06B :1011440019684FF4003393FAA3F3B3FA83F303F06B
:101154001F0321FA03F313F0010F28D1C8E0022A78 :101154001F0321FA03F313F0010F28D1C8E0022A78
@ -295,138 +295,300 @@
:101244009D4261D1236813F0040F19D0E36883B180 :101244009D4261D1236813F0040F19D0E36883B180
:10125400B3F5806F0DD0B3F5A06F0AD0B3F5C06FAE :10125400B3F5806F0DD0B3F5A06F0AD0B3F5C06FAE
:1012640007D0B3F5E06F04D040F23231274800F0E4 :1012640007D0B3F5E06F04D040F23231274800F0E4
:101274005FFA28494B6823F4E062E36813434B6048 :10127400C1FB28494B6823F4E062E36813434B60E5
:10128400236813F0080F1AD0236983B1B3F5806F74 :10128400236813F0080F1AD0236983B1B3F5806F74
:101294000DD0B3F5A06F0AD0B3F5C06F07D0B3F586 :101294000DD0B3F5A06F0AD0B3F5C06F07D0B3F586
:1012A400E06F04D040F23931184800F041FA194A8D :1012A400E06F04D040F23931184800F0A3FB194A2A
:1012B400536823F46053216943EAC1035360FFF781 :1012B400536823F46053216943EAC1035360FFF781
:1012C40093FE144B5B6803F0F002F02393FAA3F34C :1012C40093FE144B5B6803F0F002F02393FAA3F34C
:1012D400B3FA83F322FA03F30F4AD35CD8400F4BDB :1012D400B3FA83F322FA03F30F4AD35CD8400F4BDB
:1012E40018600020FFF754F8002070BD012070BD85 :1012E40018600020FFF754F8002070BD012070BD85
:1012F400012070BD012070BD012070BD032070BDB0 :1012F400012070BD012070BD012070BD032070BDB0
:10130400032070BD032070BD012070BD2C1A00089D :10130400032070BD032070BD012070BD281E00089D
:101314000020024000100240881A00080C0000203F :101314000020024000100240B01E00080C00002013
:10132400014B1868704700BF0C000020002800F033 :10132400014B1868704700BF0C0000202DE9F04104
:10133400BC8010B5044603685D4A93420BD0A2F505 :1013340005460E4690461C46FFF758F80746B8F196
:101344007842934207D002F58062934203D06B2126 :10134400000F2AD05BE0B4F1FF3F26D024B1FFF7B1
:10135400584800F0EDF9636833B1B3F5827F03D0E8 :101354004DF8C01B844220D22A68536823F0E0036E
:101364006C21544800F0E4F9A3684BB1B3F5806FE5 :1013640053602A68136823F040031360AB6AB3F533
:1013740006D0B3F5004F03D06D214E4800F0D8F9E4 :10137400005F09D12A68136823F4005313602A68B4
:10138400E368B3F5006F04D01BB16E21494800F047 :10138400136843F400531360012385F8513000239C
:10139400CFF923692BB1022B03D06F21454800F00C :1013940085F850300320BDE8F0812B689B6836EA5D
:1013A400C7F96369012B03D97021424800F0C0F9E1 :1013A4000303D0D10020BDE8F081B4F1FF3F26D083
:1013B400A369B3F5007F07D033B1B3F5802F03D011 :1013B40024B1FFF71BF8C01B844220D22A6853686B
:1013C40071213C4800F0B4F9E3698BB1082B0FD0CC :1013C40023F0E00353602A68136823F0400313609A
:1013D400102B0DD0182B0BD0202B09D0282B07D085 :1013D400AB6AB3F5005F09D12A68136823F400539C
:1013E400302B05D0382B03D07221324800F0A0F9FD :1013E40013602A68136843F400531360012385F8DB
:1013F400236A2BB1802B03D073212E4800F098F977 :1013F4005130002385F850300320BDE8F0812B687C
:10140400636A1BB174212B4800F092F9A36A33B1CB :101404009B6836EA0303D0D00020BDE8F08100BF1A
:10141400B3F5005F03D07521264800F089F9E36A2B :10141400F0B583B090F85150EDB2012D40F0D18079
:10142400013B4FF6FE72934203D97621214800F026 :10142400002900F0D080002A00F0CF801F46164625
:101434007FF994F8513013F0FF0F02D1204600F0E9 :101434000D46044683683BB1B3F5004F04D040F237
:10144400C1F9022384F851302268136823F0400361 :10144400A311674800F0D6FA94F85030012B00F04D
:10145400136021686268A3681A43E3681A43236926 :10145400BE80012384F85030122384F851300023D5
:101464001A4363691A43A36903F400731343E269DB :1014640063652563A686E686E364A364A363A38712
:101474001343226A1343A26A1A430A602168638BE6 :10147400E387A36AB3F5005F09D12268136823F4F4
:1014840003F00402636A13434B602368E26A1A613F :10148400005313602268136843F400531360A36885
:101494002268D36923F40063D3610020064B1870DB :10149400B3F5004F04D12268136843F4804313600A
:1014A4006065012384F8513010BD0120704700BFEE :1014A40023681A6812F0400F03D11A6842F0400210
:1014B40000300140581A00081C000020FEE700BF5D :1014B4001A60E368002B2CD1636813B1E38E012B0F
:1014C40001230360014B0B60704700BF0400002040 :1014C4001AD12268236B591C21631B78D360E38EE5
:1014D40008B500F00FF8024B024A9A6008BD00BF3D :1014D400013BE38610E03B46002202212046FFF751
:1014E40000ED00E00000000808B500F029F808BD90 :1014E40025FF002875D12268236B591C21631B78C2
:1014F400FEE700000F4B1A6842F001021A605968B7 :1014F400D360E38E013BE386E38E002BEBD1A36A3A
:101504000D4A0A405A601A6822F0847222F480322A :10150400B3F5005F33D12268136843F4805313604A
:101514001A601A6822F480221A605A6822F4FE02C1 :101514002DE0636813B1E38E012B1CD12368226B89
:101524005A604FF41F029A604FF00062034B9A60B6 :101524001288DA60236B02332363E38E013BE38684
:10153400704700BF001002400000FFF800ED00E01B :1015340011E03B46002202212046FFF7F7FE002877
:101544001F4B5B6803F00C03042B06D0082B08D058 :1015440049D12368226B1288DA60236B0233236348
:101554003BBB1C4A1C4B1A6026E01A4A1A4B1A6001 :10155400E38E013BE386E38E002BEAD1A36AB3F565
:1015640022E0174A53685268C3F38343023312F4E8 :10156400005F04D12268136843F4805313603B4640
:10157400803F05D1154A02FB03F3134A136013E0BD :10157400002202212046FFF7D9FE28B1636D43F013
:101584000F4A526812F4003F05D0104A02FB03F3DD :1015840010036365032327E03B46012280212046A4
:101594000D4A136008E00B4A02FB03F30A4A136086 :10159400FFF7CCFE034628B1636D43F01003636587
:1015A40002E0084A084B1A60054B5B68C3F3031357 :1015A400032319E0A2682AB92268D16801919268DC
:1015B400074AD15C044A1368CB401360704700BFEC :1015B4000192019A012284F85120002284F85020DB
:1015C4000010024000127A000C00002000093D00C7 :1015C4000AE0022308E0012306E0012304E00223E9
:1015D400881A0008F0B587B01A4B9A6942F01002D5 :1015D40002E0032300E00323184603B0F0BD00BF7C
:1015E4009A619A6902F010020092009A9A6942F094 :1015E400541E0008002800F0BC8010B504460368AF
:1015F40004029A619B6903F004030193019B124F57 :1015F4005D4A93420BD0A2F57842934207D002F59C
:1016040000224FF400513846FFF736F90F4C002200 :101604008062934203D06B21584800F0F3F9636879
:101614000E212046FFF730F94FF4005302930126C0 :1016140033B1B3F5827F03D06C21544800F0EAF96A
:1016240003960225059502A93846FEF789FF0E2385 :10162400A3684BB1B3F5806F06D0B3F5004F03D078
:1016340002930396059502A92046FEF781FF07B0A1 :101634006D214E4800F0DEF9E368B3F5006F04D085
:10164400F0BD00BF0010024000100140000801403E :101644001BB16E21494800F0D5F923692BB1022B57
:1016540008B500F01BF9FEE708B50D480D4B036013 :1016540003D06F21454800F0CDF96369012B03D90C
:101664004FF48273436000238360C360036143616A :101664007021424800F0C6F9A369B3F5007F07D0A2
:101674004FF4007282611822C26103624362836282 :1016740033B1B3F5802F03D071213C4800F0BAF99F
:101684000A23C362FFF752FE08B1FFF7E1FF08BD6A :10168400E3698BB1082B0FD0102B0DD0182B0BD086
:10169400240000200030014000B591B001230693DE :10169400202B09D0282B07D0302B05D0382B03D092
:1016A4004FF4803307930022089202220D920E9386 :1016A4007221324800F0A6F9236A2BB1802B03D0B3
:1016B4004FF4E0130F9306A8FFF708F908B1FFF7FA :1016B40073212E4800F09EF9636A1BB174212B48F4
:1016C400C7FF0F23019302210291002303934FF4D8 :1016C40000F098F9A36A33B1B3F5005F03D0752134
:1016D40080620492059301A8FFF7D0FC08B1FFF7DC :1016D400264800F08FF9E36A013B4FF6FE7293420D
:1016E400B7FFFFF71DFE094BA3FB00308009FEF78F :1016E40003D97621214800F085F994F8513013F09C
:1016F400F1FE0420FEF704FF002211464FF0FF30F4 :1016F400FF0F02D1204600F0C7F9022384F85130CD
:10170400FEF7A6FE11B05DF804FB00BFD34D6210D6 :101704002268136823F04003136021686268A368A9
:1017140008B500F0AFF8FEF74FFEFFF7BDFFFFF787 :101714001A43E3681A4323691A4363691A43A369A2
:1017240059FFFFF799FF00F0B3F800F0A7F8FCE7C2 :1017240003F400731343E2691343226A1343A26A66
:10173400704700BF00B583B0204B9A6942F00102A4 :101734001A430A602168638B03F00402636A13434B
:101744009A619B6903F001030193019B0320FEF757 :101744004B602368E26A1A612268D36923F4006358
:1017540061FE002211466FF00B00FEF779FE0022B5 :10175400D3610020064B18706065012384F8513072
:1017640011466FF00A00FEF773FE002211466FF077 :1017640010BD0120704700BF00300140801E0008FA
:101774000900FEF76DFE002211466FF00400FEF72B :101774001C000020FEE700BF01230360014B0B6047
:1017840067FE002211466FF00300FEF761FE00229F :10178400704700BF0400002008B500F00FF8024BBA
:1017940011466FF00100FEF75BFE002211464FF088 :10179400024A9A6008BD00BF00ED00E000000008A6
:1017A400FF30FEF755FE064A536823F0E06343F02A :1017A40008B500F029F808BDFEE700000F4B1A68E1
:1017B4000073536003B05DF804FB00BF00100240E7 :1017B40042F001021A6059680D4A0A405A601A68D8
:1017C400000001400268134B9A4222D110B586B042 :1017C40022F0847222F480321A601A6822F4802291
:1017D40003F560439A6942F480529A619B6903F469 :1017D4001A605A6822F4FE025A604FF41F029A609B
:1017E40080530193019BA0230293022303930323B9 :1017E4004FF00062034B9A60704700BF0010024044
:1017F4000593094C02A92046FEF7A2FE402302935A :1017F4000000FFF800ED00E01F4B5B6803F00C03F2
:1018040000230393049302A92046FEF799FE06B031 :10180400042B06D0082B08D03BBB1C4A1C4B1A6087
:1018140010BD70470030014000080140704700BF10 :1018140026E01A4A1A4B1A6022E0174A53685268A3
:10182400FEE700BFFEE700BFFEE700BFFEE700BF24 :10182400C3F38343023312F4803F05D1154A02FB0C
:10183400704700BF704700BF704700BF08B5FEF790 :1018340003F3134A136013E00F4A526812F4003F93
:10184400CDFDFEF779FE08BD08B54FF400510248FE :1018440005D0104A02FB03F30D4A136008E00B4A6B
:10185400FFF72CF808BD00BF0010014008B54FF495 :1018540002FB03F30A4A136002E0084A084B1A60C9
:101864007A7300221146024800F02EF808BD00BF2A :10186400054B5B68C3F30313074AD15C044A13684E
:101874004D18000808B500F00FF808BD08B500F0D1 :10187400CB401360704700BF0010024000127A0092
:1018840043F808BD08B500F06BF808BD704700BF09 :101884000C00002000093D00B01E0008F0B587B030
:1018940008B5FFF7E3FF08BD30B400230EE0094CA0 :101894001C4B9A6942F010029A619A6902F0100294
:1018A4009900CA18950060190022625142600272C0 :1018A4000092009A9A6942F004029A619B6903F0DB
:1018B400C2602846204402610133DBB20F2BEED90B :1018B40004030193019B144F00224FF40051384656
:1018C40030BC70477C000020F0B5002417E02746A8 :1018C400FEF7DAFF114C002206212046FEF7D4FF72
:1018D40004EB8406B5000B4E3544ED686DB934460F :1018D400012208212046FEF7CFFF4FF40053029364
:1018E4004FEA870E0EEB0705AE00A519A2516B60F7 :1018E400012603960225059502A93846FEF728FE2F
:1018F40000232B72E8602961F0BD0134E4B20F2C9F :1018F4000E2302930396059502A92046FEF720FEC7
:10190400E5D9F0BD7C00002070B5002422E004EB92 :1019040007B0F0BD00100240001001400008014083
:1019140084029300114A1344DB68CBB104EB8402C4 :1019140008B500F01DF9FEE708B50E480E4B03604C
:1019240093000E4A13441B7A93B1A10021448A0008 :101924004FF48273436000238360C3600222026128
:101934000A4E1644013B3372F36830699847736862 :10193400012242614FF4007282611822C261036283
:1019440033B904EB8405AB00044A13440022DA6083 :10194400436283620A23C362FFF74CFE08B1FFF7C8
:101954000134E4B20F2CDAD970BD00BF7C00002042 :10195400DFFF08BD240000200030014000B591B035
:1019640070B400231FE003EB83008200104802449C :10196400012306934FF48033079300220892022246
:10197400D268B2B103EB830082000D48825852B999 :101974000D920E934FF4E0130F9306A8FEF7A6FF03
:1019840004469A00D518A80025186E682650287AAF :1019840008B1FFF7C5FF0F23019302210291002341
:10199400411C297205E003EB83018800013A0449E4 :1019940003934FF480620492059301A8FFF76EFB52
:1019A4000A500133DBB20F2BDDD970BC704700BF86 :1019A40008B1FFF7B5FFFFF7BBFC094BA3FB003001
:1019B4007C0000202E2E2F73797374656D2F737243 :1019B4008009FEF78FFD0420FEF7A2FD00221146E8
:1019C400632F73746D3332663178782F73746D338B :1019C4004FF0FF30FEF744FD11B05DF804FB00BF9B
:1019D40032663178785F68616C5F636F72746578C2 :1019D400D34D621008B500F0AFF8FEF7EDFCFFF749
:1019E4002E6300002E2E2F73797374656D2F73721E :1019E400BDFFFFF753FFFFF797FF00F0B3F800F0D8
:1019F400632F73746D3332663178782F73746D335B :1019F400A7F8FCE7704700BF00B583B0204B9A6995
:101A040032663178785F68616C5F6770696F2E63E6 :101A040042F001029A619B6903F001030193019B77
:101A14000000000002030405060708090A0B0C0D68 :101A14000320FEF7FFFC002211466FF00B00FEF7D7
:101A24000E0F1010010200002E2E2F7379737465AF :101A240017FD002211466FF00A00FEF711FD002297
:101A34006D2F7372632F73746D3332663178782F20 :101A340011466FF00900FEF70BFD002211466FF00E
:101A440073746D3332663178785F68616C5F72638A :101A44000400FEF705FD002211466FF00300FEF7C7
:101A5400632E63002E2E2F73797374656D2F73724A :101A5400FFFC002211466FF00100FEF7F9FC0022A2
:101A6400632F73746D3332663178782F73746D33EA :101A640011464FF0FF30FEF7F3FC064A536823F0AB
:101A740032663178785F68616C5F7370695F65782E :101A7400E06343F00073536003B05DF804FB00BF00
:101A84002E630000000000000000000001020304B7 :101A840000100240000001400268134B9A4222D128
:041A94000607080930 :101A940010B586B003F560439A6942F480529A61A6
:101A980078563412200000200000000000A24A04FA :101AA4009B6903F480530193019BA02302930223B7
:041AA80032547698A6 :101AB400039303230593094C02A92046FEF740FD36
:101AC4004023029300230393049302A92046FEF7C4
:101AD40037FD06B010BD70470030014000080140DA
:101AE400704700BFFEE700BFFEE700BFFEE700BF90
:101AF400FEE700BF704700BF704700BF704700BFDC
:101B040008B5FEF76BFCFEF717FD08BD08B54FF4EA
:101B140000510248FEF7CAFE08BD00BF0010014094
:101B240008B54FF47A7300221146024800F0CAF84F
:101B340008BD00BF111B000808B500F0ABF808BDD4
:101B440008B500F0DFF808BD08B500F007F908BDD6
:101B5400704700BF08B5FFF7E3FF034A00210846BA
:101B640000F058F808BD00BFC01E000808B50246C2
:101B740002210248FEF780FE08BD00BF00080140B4
:101B840008B5024608210248FEF776FE08BD00BFEC
:101B94000008014010B582B002AC04F8010D002029
:101BA400FFF7EEFF0120FFF7E1FF002301222146AA
:101BB4000348FFF72DFC0120FFF7E2FF02B010BD40
:101BC4002400002010B582B002AC04F8010D0020FE
:101BD400FFF7D6FF0020FFF7C9FF002301222146AB
:101BE4000348FFF715FC0120FFF7CAFF02B010BD40
:101BF4002400002010B504465039C8B2FFF7E2FFB4
:101C0400200940F01000FFF7DDFF04F00F00FFF79C
:101C1400D9FF10BD2DE9F8430646884691460027B2
:101C24002FE0203DEDB2782E04D908F101085FFAC7
:101C340088F8002641463046FFF7DCFF002407E021
:101C440004EB0513124AD05CFFF7A4FF0134E4B29D
:101C5400072CF5D908F10101C9B23046FFF7CAFFD4
:101C6400002408E004EB05130833094AD05CFFF7AD
:101C740091FF0134E4B2072CF4D90836F6B20137E7
:101C8400FFB219F90750002DCBD1BDE8F88300BF8E
:101C9400C81E000830B400230EE0094C9900CA188D
:101CA400950060190022625142600272C2602846A7
:101CB400204402610133DBB20F2BEED930BC7047F4
:101CC4007C000020F0B5002417E0274604EB8406CE
:101CD400B5000B4E3544ED686DB934464FEA870EB6
:101CE4000EEB0705AE00A519A2516B6000232B7201
:101CF400E8602961F0BD0134E4B20F2CE5D9F0BDF0
:101D04007C00002070B5002422E004EB84029300E0
:101D1400114A1344DB68CBB104EB840293000E4AEE
:101D240013441B7A93B1A10021448A000A4E16443D
:101D3400013B3372F36830699847736833B904EB35
:101D44008405AB00044A13440022DA600134E4B28F
:101D54000F2CDAD970BD00BF7C00002070B40023C2
:101D64001FE003EB8300820010480244D268B2B142
:101D740003EB830082000D48825852B904469A004E
:101D8400D518A80025186E682650287A411C297297
:101D940005E003EB83018800013A04490A5001334A
:101DA400DBB20F2BDDD970BC704700BF7C00002074
:101DB4002E2E2F73797374656D2F7372632F737462
:101DC4006D3332663178782F73746D3332663178BF
:101DD400785F68616C5F636F727465782E6300006E
:101DE4002E2E2F73797374656D2F7372632F737432
:101DF4006D3332663178782F73746D33326631788F
:101E0400785F68616C5F6770696F2E630000000023
:101E140002030405060708090A0B0C0D0E0F101027
:101E2400010200002E2E2F73797374656D2F737267
:101E3400632F73746D3332663178782F73746D3316
:101E440032663178785F68616C5F7263632E630019
:101E54002E2E2F73797374656D2F7372632F7374C1
:101E64006D3332663178782F73746D33326631781E
:101E7400785F68616C5F7370692E63002E2E2F7318
:101E8400797374656D2F7372632F73746D33326657
:101E94003178782F73746D3332663178785F686186
:101EA4006C5F7370695F65782E630000000000004A
:101EB40000000000010203040607080948616C6C75
:101EC4006F0000000000000000000000000000009F
:101ED40000000000000000F80000000000000033D3
:101EE4003000000000100C06100C0600000000007A
:101EF4000000000040C07840C0784000043F040463
:101F04003F040400007088FC08300000001820FF23
:101F1400211E0000F008F000E018000000211C035E
:101F24001E211E0000F00888700000001E212324DA
:101F34001927211010160E000000000000000000F8
:101F440000000000000000E0180402000000000788
:101F54001820400000020418E0000000004020188F
:101F640007000000404080F0804040000202010F62
:101F740001020200000000F0000000000101011F46
:101F840001010100000000000000000080B07000AA
:101F9400000000000000000000000000000101013A
:101FA40001010101000000000000000000303000C9
:101FB40000000000000000008060180400601806A3
:101FC4000100000000E010080810E000000F1020DD
:101FD40020100F00001010F8000000000020203F27
:101FE40020200000007008080888700000302824B1
:101FF4002221300000300888884830000018202052
:1020040020110E000000C02010F800000007042476
:10201400243F240000F808888808080000192120BB
:1020240020110E0000E0108888180000000F112015
:1020340020110E0000380808C83808000000003FCE
:10204400000000000070880808887000001C22212D
:1020540021221C0000E010080810E00000003122DA
:1020640022110F00000000C0C0000000000000307A
:1020740030000000000000800000000000008060CC
:10208400000000000000804020100800000102044D
:102094000810200040404040404040000404040434
:1020A40004040400000810204080000000201008F0
:1020B40004020100007048080808F0000000003025
:1020C40036010000C030C828E810E00007182724B3
:1020D40023140B000000C038E0000000203C230261
:1020E4000227382008F8888888700000203F2020C4
:1020F40020110E00C03008080808380007182020F6
:102104002010080008F808080810E000203F2020EC
:1021140020100F0008F88888E8081000203F2020CD
:102124002320180008F88888E8081000203F2000C1
:1021340003000000C03008080838000007182020F9
:10214400221E020008F808000008F808203F2101B8
:1021540001213F20000808F8080800000020203F63
:102164002020000000000808F8080800C0808080D3
:102174007F00000008F888C028180800203F2001CC
:102184002638200008F8080000000000203F202026
:102194002020300008F8F800F8F80800203F003F3D
:1021A400003F200008F830C00008F808203F200055
:1021B40007183F00E01008080810E0000F10202066
:1021C40020100F0008F808080808F000203F21013B
:1021D40001010000E01008080810E0000F18242492
:1021E40038504F0008F8888888887000203F200005
:1021F400030C3020007088080808380000382021BB
:1022040021221C00180808F8080818000000203FC4
:102214002000000008F808000008F808001F20202B
:1022240020201F000878880000C8380800000738FC
:102234000E010000F80800F80008F800033C07004D
:10224400073C0300081868808068180820302C03B5
:10225400032C30200838C800C83808000000203F8C
:102264002000000010080808C8380800203826217B
:1022740020201800000000FE020202000000007F7F
:1022840040404000000C30C000000000000000018D
:102294000638C00000020202FE0000000040404078
:1022A4007F0000000000040202020400000000009D
:1022B400000000000000000000000000808080801A
:1022C4008080808000020204000000000000000002
:1022D400000000000000808080800000001924229B
:1022E40022223F2008F8008080000000003F1120D7
:1022F40020110E000000008080800000000E1120DC
:1023040020201100000000808088F800000E1120B9
:1023140020103F200000808080800000001F2222C7
:1023240022221300008080F0888888180020203F33
:10233400202000000000808080808000006B949446
:102344009493600008F8008080800000203F210002
:1023540000203F2000809898000000000020203FCB
:1023640020200000000000809898000000C08080B9
:10237400807F000008F8000080808000203F240255
:102384002D302000000808F8000000000020203F45
:10239400202000008080808080808000203F2000FA
:1023A4003F20003F8080008080800000203F21008B
:1023B40000203F200000808080800000001F20203B
:1023C40020201F00808000808000000080FFA1206A
:1023D40020110E000000008080808000000E11207B
:1023E40020A0FF80808080008080800020203F210A
:1023F40020000100000080808080800000332424BD
:1024040024241900008080E0808000000000001F68
:10241400202000008080000000808000001F202019
:1024240020103F20808080000080808000010E30DA
:102434000806010080800080008080800F300C033B
:102444000C300F0000808000808080000020312E3E
:102454000E312000808080000080808080818E701A
:102464001806010000808080808080000021302CCC
:102474002221300000000000807C020200000000E5
:10248400003F404000000000FF000000000000008A
:10249400FF0000000002027C800000000040403F7A
:1024A4000000000000060101020204040000000014
:0424B4000000000024
:1024B80078563412200000200000000000A24A04D0
:0424C800325476987C
:04000005080001E509 :04000005080001E509
:00000001FF :00000001FF

896
Debug/newcar.map
View File

File diff suppressed because it is too large Load Diff

BIN
Debug/src/main.o
View File

Binary file not shown.

9
cube/newcar/Src/main.c
View File

@ -142,8 +142,8 @@ static void MX_SPI1_Init(void)
hspi1.Init.Mode = SPI_MODE_MASTER; hspi1.Init.Mode = SPI_MODE_MASTER;
hspi1.Init.Direction = SPI_DIRECTION_2LINES; hspi1.Init.Direction = SPI_DIRECTION_2LINES;
hspi1.Init.DataSize = SPI_DATASIZE_8BIT; hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW; hspi1.Init.CLKPolarity = SPI_POLARITY_HIGH;
hspi1.Init.CLKPhase = SPI_PHASE_1EDGE; hspi1.Init.CLKPhase = SPI_PHASE_2EDGE;
hspi1.Init.NSS = SPI_NSS_SOFT; hspi1.Init.NSS = SPI_NSS_SOFT;
hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
@ -177,7 +177,10 @@ static void MX_GPIO_Init(void)
HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */ /*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin|OLED_CS_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(OLED_CS_GPIO_Port, OLED_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin : LED_Pin */ /*Configure GPIO pin : LED_Pin */
GPIO_InitStruct.Pin = LED_Pin; GPIO_InitStruct.Pin = LED_Pin;

7
cube/newcar/newcar.ioc
View File

@ -52,9 +52,10 @@ PA2.GPIOParameters=GPIO_Label
PA2.GPIO_Label=OLED_RST PA2.GPIO_Label=OLED_RST
PA2.Locked=true PA2.Locked=true
PA2.Signal=GPIO_Output PA2.Signal=GPIO_Output
PA3.GPIOParameters=GPIO_Label PA3.GPIOParameters=PinState,GPIO_Label
PA3.GPIO_Label=OLED_CS PA3.GPIO_Label=OLED_CS
PA3.Locked=true PA3.Locked=true
PA3.PinState=GPIO_PIN_SET
PA3.Signal=GPIO_Output PA3.Signal=GPIO_Output
PA5.Mode=Full_Duplex_Master PA5.Mode=Full_Duplex_Master
PA5.Signal=SPI1_SCK PA5.Signal=SPI1_SCK
@ -126,8 +127,10 @@ RCC.TimSysFreq_Value=72000000
RCC.USBFreq_Value=72000000 RCC.USBFreq_Value=72000000
RCC.VCOOutput2Freq_Value=8000000 RCC.VCOOutput2Freq_Value=8000000
SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_16 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_16
SPI1.CLKPhase=SPI_PHASE_2EDGE
SPI1.CLKPolarity=SPI_POLARITY_HIGH
SPI1.CalculateBaudRate=4.5 MBits/s SPI1.CalculateBaudRate=4.5 MBits/s
SPI1.IPParameters=Mode,BaudRatePrescaler,CalculateBaudRate SPI1.IPParameters=Mode,BaudRatePrescaler,CalculateBaudRate,CLKPolarity,CLKPhase
SPI1.Mode=SPI_MODE_MASTER SPI1.Mode=SPI_MODE_MASTER
VP_SYS_VS_Systick.Mode=SysTick VP_SYS_VS_Systick.Mode=SysTick
VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_SYS_VS_Systick.Signal=SYS_VS_Systick

9
src/main.c
View File

@ -146,8 +146,8 @@ static void MX_SPI1_Init(void)
hspi1.Init.Mode = SPI_MODE_MASTER; hspi1.Init.Mode = SPI_MODE_MASTER;
hspi1.Init.Direction = SPI_DIRECTION_2LINES; hspi1.Init.Direction = SPI_DIRECTION_2LINES;
hspi1.Init.DataSize = SPI_DATASIZE_8BIT; hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW; hspi1.Init.CLKPolarity = SPI_POLARITY_HIGH;
hspi1.Init.CLKPhase = SPI_PHASE_1EDGE; hspi1.Init.CLKPhase = SPI_PHASE_2EDGE;
hspi1.Init.NSS = SPI_NSS_SOFT; hspi1.Init.NSS = SPI_NSS_SOFT;
hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
@ -181,7 +181,10 @@ static void MX_GPIO_Init(void)
HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */ /*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin|OLED_CS_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(OLED_CS_GPIO_Port, OLED_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin : LED_Pin */ /*Configure GPIO pin : LED_Pin */
GPIO_InitStruct.Pin = LED_Pin; GPIO_InitStruct.Pin = LED_Pin;

9
src/main.c-bak
View File

@ -142,8 +142,8 @@ static void MX_SPI1_Init(void)
hspi1.Init.Mode = SPI_MODE_MASTER; hspi1.Init.Mode = SPI_MODE_MASTER;
hspi1.Init.Direction = SPI_DIRECTION_2LINES; hspi1.Init.Direction = SPI_DIRECTION_2LINES;
hspi1.Init.DataSize = SPI_DATASIZE_8BIT; hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW; hspi1.Init.CLKPolarity = SPI_POLARITY_HIGH;
hspi1.Init.CLKPhase = SPI_PHASE_1EDGE; hspi1.Init.CLKPhase = SPI_PHASE_2EDGE;
hspi1.Init.NSS = SPI_NSS_SOFT; hspi1.Init.NSS = SPI_NSS_SOFT;
hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
@ -177,7 +177,10 @@ static void MX_GPIO_Init(void)
HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */ /*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin|OLED_CS_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOA, OLED_DC_Pin|OLED_RST_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(OLED_CS_GPIO_Port, OLED_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin : LED_Pin */ /*Configure GPIO pin : LED_Pin */
GPIO_InitStruct.Pin = LED_Pin; GPIO_InitStruct.Pin = LED_Pin;