diff --git a/README.md b/README.md index bdb9137a2c8282a35903cd24916dd9ba14a02b94..a70829a273111cfebc5de244d2d78e603e0cf58f 100644 --- a/README.md +++ b/README.md @@ -24,15 +24,16 @@ Onewire | 模拟单总线 | IO模拟 外设 | 型号 | 原厂 | 接口 | 备注 --- | --- | --- | --- | --- -温度传感器 | LM75A | NXP | I2C -LED恒流驱动 | LP55231 | TI | I2C -EEPROM/FRAM | AT24Cxx | ATMEL | I2C -EEPROM | ST25AAXX | ST | SPI +温度传感器 | LM75A | NXP | I2C | +LED恒流驱动 | LP55231 | TI | I2C | +EEPROM/FRAM | AT24Cxx | ATMEL | I2C | +EEPROM | ST25AAXX | ST | SPI | ADC | AD7684 | ADI | SPI | 3线SPI -步进电机驱动 | TMC2660 | TRINAMIC | SPI +步进电机驱动 | TMC2660 | TRINAMIC | SPI| 温度传感器 | DS18B20 | MAXIM | Onewire| DAC | AD5290 | ADI | SPI | 3线SPI -三轴加速度传感器 | LIS3DH | ST | I2C +三轴加速度传感器 | LIS3DH | ST | I2C | +热电阻/热电偶驱动芯片 | AD7793 | ADI | SPI | 4.更新 - diff --git a/driver/ad7793.c b/driver/ad7793.c new file mode 100644 index 0000000000000000000000000000000000000000..0ecee32babe423bea0fff0d3826274b48e1a11d6 --- /dev/null +++ b/driver/ad7793.c @@ -0,0 +1,255 @@ + +#include +#include "stm32f10x.h" +#include "ad7793.h" + +/* ad7793寄存器 */ +#define REG_COMM_STA 0x00 /* 8bit,写时为通讯寄存器/读时为状态寄存器 */ +#define REG_MODE 0x08 /* 16bit,模式寄存器 */ +#define REG_CONFIG 0x10 /* 16bit,配置寄存器 */ +#define REG_DATA 0x18 /* 24bit,数据寄存器 */ +#define REG_ID 0x20 /* 8bit,芯片ID寄存器 */ +#define REG_IO 0x28 /* 8bit,IO寄存器 */ +#define REG_IMBL 0x30 /* 24bit,失调寄存器 */ +#define REG_FULL 0x38 /* 24bit,满量程寄存器 */ + +/* ad7793读写指令 */ +#define READ_EN 0x40 /* 读使能 */ +#define SINGLE_CONVER 0x2000 /* 单次转换 */ +#define CONTINUE_CONVER 0x00 /* 连续转换 */ +#define CONTINUE_READ 0x20 /* 连续读 */ + +/* 恒流源控制 */ +#define CURRENT_OUT1_1 0x00 /* 两路电流正常输出到IO1、IO2 */ +#define CURRENT_OUT1_2 0x04 /* 两路电流输出IO1、IO2互换 */ +#define CURRENT_OUT1 0x08 /* 两路电流叠加输出到IO1,只对10uA和210uA有效 */ +#define CURRENT_OUT2 0x0C /* 两路电流叠加输出到IO2,只对10uA和210uA有效 */ +#define CURRENT_10UA 0x01 /* 10uA电流 */ +#define CURRENT_210UA 0x02 /* 210uA电流 */ +#define CURRENT_1MA 0x03 /* 1mA电流 */ + +/* 配置寄存值 */ +#define BIPOLAR 0x0000 /* 双极性 */ +#define UNIPOLAR 0x1000 /* 单极性 */ +#define GAIN_1 0x0000 /* 增益1~128 */ +#define GAIN_2 0x0100 +#define GAIN_4 0x0200 +#define GAIN_8 0x0300 +#define GAIN_16 0x0400 +#define GAIN_32 0x0500 +#define GAIN_64 0x0600 +#define GAIN_128 0x0700 + +#define OUTER_VREF 0x0000 /* 外部参考源 */ +#define INNER_VREF 0x0080 /* 内部参考源 */ + +#define NO_BUF 0x0000 /* 无缓存 */ +#define USE_BUF 0x0010 /* 使用缓存 */ +#define AIN_CH1 0x0000 /* 检测通道1~3 */ +#define AIN_CH2 0x0001 +#define AIN_CH3 0x0002 + +/* ad7793 工作模式选择 */ +#define MODE_NONE 0x00 +#define MODE_BIPOLAR 0x01 /* 双极性模式 */ +#define MODE_UNIPOLAR 0x02 /* 单极性模式 */ +#define MODE_2LINE_RTD 0x04 /* 两线RTD */ +#define MODE_3LINE_RTD 0x08 /* 三线RTD */ +#define MODE_4LINE_RTD 0x10 /* 四线RTD */ + +struct _ad7793_info +{ + uint8_t mode; /* 工作模式 */ + uint16_t ref; /* 参考电阻阻值, Ω */ + uint16_t gain; /* 增益 */ + uint8_t id; /* 芯片id */ +}; + +/* ad7793 spi device */ +static struct spi_dev_device ad7793_spi_dev[1]; + +/* mode select */ +static struct _ad7793_info s_ad7793_info = +{ + .mode = MODE_BIPOLAR|MODE_4LINE_RTD,/* 双精度/4线RTD */ + .ref = 2000, /* 2kΩ */ + .gain = GAIN_1, +}; + +static void ad7793_spi_cs(uint8_t state) +{ + if (state) + { + GPIO_SetBits(GPIOA, GPIO_Pin_1); + } + else + { + GPIO_ResetBits(GPIOA, GPIO_Pin_1); + } +} + +static uint8_t ad7793_spi_write(uint8_t addr, uint8_t *pbuf, uint8_t size) +{ + spi_send_then_send(&ad7793_spi_dev[0], &addr, 1, pbuf, size); + return size; +} + +static uint8_t ad7793_spi_write_byte(uint8_t addr, uint8_t data) +{ + ad7793_spi_write(addr, &data, 1); + return 0x01; +} + +static uint8_t ad7793_spi_write_word(uint8_t addr, uint16_t data) +{ + uint8_t buf[2] = {0}; + + buf[0] = (data>>8)&0xff; + buf[1] = data&0xff; + ad7793_spi_write(addr, &buf[0], 2); + + return 0x02; +} + +static uint8_t ad7793_spi_write_3byte(uint8_t addr, uint32_t data) +{ + uint8_t buf[3] = {0}; + + buf[0] = (data>>16)&0xff; + buf[1] = (data>>8)&0xff; + buf[2] = data&0xff; + ad7793_spi_write(addr, &buf[0], 3); + + return 0x03; +} + +static uint8_t ad7793_spi_read(uint8_t addr, uint8_t *pbuf, uint8_t size) +{ + spi_send_then_recv(&ad7793_spi_dev[0], &addr, 1, pbuf, size); + + return size; +} + +static void ad7793_soft_reset(void) +{ + uint8_t buf[] ={0xff, 0xff, 0xff,0xff}; + + ad7793_spi_write(REG_COMM_STA, &buf[0], 4); +} + +static void ad7793_register_init(void) +{ + uint16_t mode = 0x00; + + /* read chip id */ + ad7793_spi_read(REG_ID, &s_ad7793_info.id, 1); + + /* 65db抑 */ + ad7793_spi_write_word(REG_MODE, 0x000A); + + if (s_ad7793_info.mode&MODE_UNIPOLAR) + { + mode |= MODE_UNIPOLAR; + } + else if (s_ad7793_info.mode&MODE_BIPOLAR) + { + mode |= MODE_BIPOLAR; + } + + if (s_ad7793_info.gain > GAIN_128) + { + s_ad7793_info.gain = GAIN_128; + } + mode |= s_ad7793_info.gain; + + /* 双极性/无增益/外部参考源/无缓存/通道AIN1 */ + ad7793_spi_write_word(REG_CONFIG, mode|OUTER_VREF|NO_BUF|AIN_CH1); + + /* 210uA恒流源输出 */ + ad7793_spi_write_byte(REG_IO, CURRENT_OUT1_1|CURRENT_210UA); +} + +int8_t ad7793_read_data(int32_t *ad_value) +{ + int8_t ret = 0; + uint8_t temp = 0; + uint8_t buf[3] = {0}; + + ad7793_spi_read(REG_COMM_STA|READ_EN, &temp ,1);/* 读取转换完成状态 */ + + if (0xbf == (temp|0xbf)) + { + ad7793_spi_read(REG_DATA|READ_EN, &buf[0] ,3); + *ad_value = (buf[0]<<16) | (buf[1]<<8) | buf[2]; + } + else + { + /* todo,出错? */ + ret = -1; + } + return ret; +} + +int8_t ad7793_init(struct spi_bus_device *spi_bus) +{ + GPIO_InitTypeDef GPIO_InitStructure; + + if (NULL == spi_bus) + { + return -1; + } + + /* spi cs */ + GPIO_SetBits(GPIOA, GPIO_Pin_1); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA ,ENABLE); + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; + GPIO_Init(GPIOA, &GPIO_InitStructure); + + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; + GPIO_Init(GPIOA, &GPIO_InitStructure); + GPIO_SetBits(GPIOA,GPIO_Pin_11); + + /* device init */ + ad7793_spi_dev[0].spi_cs = ad7793_spi_cs; + ad7793_spi_dev[0].spi_bus = spi_bus; + + ad7793_soft_reset(); + ad7793_register_init(); + + return 0; +} + +int8_t ad7793_read_resistance(float *resistance) +{ + int8_t ret = 0; + int32_t ad_value = 0; + uint8_t gain = 0; + + if (0 != ad7793_read_data(&ad_value)) + { + return -1; + } + + gain = 0x01<<(s_ad7793_info.gain>>8); /* 计算增益 */ + + /* 根据不同模式计算 */ + if (s_ad7793_info.mode&MODE_BIPOLAR) + { + *resistance = (float)s_ad7793_info.ref *(ad_value/0x7fffff-1) / gain; + } + else if (s_ad7793_info.mode&MODE_UNIPOLAR) + { + *resistance = (float)s_ad7793_info.ref * ad_value / 0xffffff / gain; + } + + if (s_ad7793_info.mode&MODE_3LINE_RTD) + {/* 三线RTD需要两路恒流源 */ + *resistance *= 2; + } + + return ret; +} diff --git a/driver/ad7793.h b/driver/ad7793.h new file mode 100644 index 0000000000000000000000000000000000000000..7a7cd45fbec3c39359b8e63601036abd93755f0b --- /dev/null +++ b/driver/ad7793.h @@ -0,0 +1,10 @@ + +#ifndef _AD7793_H_ +#define _AD7793_H_ + +#include "spi_core.h" + +extern int8_t ad7793_init(struct spi_bus_device *spi_bus); +extern int8_t ad7793_read_resistance(float *resistance); + +#endif diff --git a/project/Projects/MDK/Project.uvguix.acuity b/project/Projects/MDK/Project.uvguix.acuity index effb3bc464ffc1a8e289c1bd3a1b241b5aaae6e6..8779c531d6f8c0739d6d9104255f02a0061fba50 100644 --- a/project/Projects/MDK/Project.uvguix.acuity +++ b/project/Projects/MDK/Project.uvguix.acuity @@ -100,8 +100,8 @@ 0 - 393 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000020000000100000033473A5C4769746875625C647269766572732D666F722D6D63755C70726F6A6563745C536F757263655C4170705C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF29473A5C4769746875625C647269766572732D666F722D6D63755C6472697665725C3234636C78782E6300000000083234636C78782E6300000000F0A0A100FFFFFFFF31473A5C4769746875625C647269766572732D666F722D6D63755C6275735F6472697665725C6F6E65776972655F68772E63000000000C6F6E65776972655F68772E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000005010000660000005605000060020000 + 586 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000010000000100000033473A5C4769746875625C647269766572732D666F722D6D63755C70726F6A6563745C536F757263655C4170705C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF29473A5C4769746875625C647269766572732D666F722D6D63755C6472697665725C6164373739332E6300000000086164373739332E6300000000BCA8E100FFFFFFFF29473A5C4769746875625C647269766572732D666F722D6D63755C6472697665725C6164373739332E6800000000086164373739332E68000000009CC1B600FFFFFFFF29473A5C4769746875625C647269766572732D666F722D6D63755C6472697665725C6164373638342E6300000000086164373638342E6300000000F7B88600FFFFFFFF29473A5C4769746875625C647269766572732D666F722D6D63755C6472697665725C6164373638342E6800000000086164373638342E6800000000D9ADC200FFFFFFFF2D473A5C4769746875625C647269766572732D666F722D6D63755C6275735F6472697665725C7370695F68772E6300000000087370695F68772E6300000000F7B88600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000005010000660000005605000047020000 @@ -140,7 +140,7 @@ 0 16 - 0300000066000000FE00000030020000 + 0300000066000000FE00000017020000 16 @@ -160,7 +160,7 @@ 0 16 - 0300000066000000FE00000030020000 + 0300000066000000FE00000017020000 16 @@ -440,7 +440,7 @@ 0 16 - 0300000066000000FE00000030020000 + 0300000066000000FE00000017020000 16 @@ -460,7 +460,7 @@ 0 16 - 0300000066000000FE00000030020000 + 0300000066000000FE00000017020000 16 @@ -480,7 +480,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000BD020000 16 @@ -520,7 +520,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000BD020000 16 @@ -1160,7 +1160,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000BD020000 16 @@ -1180,7 +1180,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000A4020000 16 @@ -1240,7 +1240,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000A4020000 16 @@ -1260,7 +1260,7 @@ 0 16 - 030000006402000053050000BD020000 + 030000004B02000053050000A4020000 16 @@ -1789,14 +1789,14 @@ 3317 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAE000000B6000000F1030000BA000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000AE00000066000000F1030000CD000000AE0000004F000000F1030000B60000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F0000004703000086010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000004703000066000000F10300009D010000470300004F000000F10300008601000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF010100004F00000005010000490200000100000002000010040000000100000009FFFFFF54040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000000101000060020000000000004F00000001010000490200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000072010000F10300007601000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000008D010000F1030000080200000000000076010000F1030000F101000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF901000076010000FD010000F101000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000049020000560500004D020000010000000100001004000000010000002AFEFFFFA6000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000006402000056050000ED020000000000004D02000056050000D60200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAE000000B6000000F1030000BA000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000AE00000066000000F1030000CD000000AE0000004F000000F1030000B60000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F0000004703000086010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000004703000066000000F10300009D010000470300004F000000F10300008601000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF010100004F00000005010000300200000100000002000010040000000100000009FFFFFF54040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000000101000060020000000000004F00000001010000300200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000072010000F10300007601000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000008D010000F1030000080200000000000076010000F1030000F101000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF901000076010000FD010000F101000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000003002000056050000340200000100000001000010040000000100000000FEFFFF7C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000006402000056050000ED020000000000003402000056050000D60200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2659 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D434D445F57524954455F44454E960000000000000014000002753808693263315F6465760A777269746562797465730F6932635F3234636C78785F77616974106932635F3234636C78785F7772697465105553455F3234434C58585F44454255470D434D445F57524954455F44454E1073745F6F70735F737069315F696E69740F636F6D6D735F73706565645F6B687A0A636F6D6D735F7479706562564C35334C30585F4572726F7220564C35334C30585F5570646174654279746528564C35334C30585F444556204465762C2075696E74385F7420696E6465782C2075696E74385F7420416E64446174612C2075696E74385F74204F7244617461293B0C564C35334C30585F414444521352545F53454E534F525F434C4153535F544F461072745F68775F73657269616C5F6973721A52545F53455249414C5F4556454E545F52585F444D41444F4E4505627566737A1073657474696E675F726563765F6C656E086B65795F696E69740C4750494F5F50696E735F31330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 + 2359 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4144373739335265616496000000000000000A00116164373739335F736F66745F72657365740C6164373739335F72657365740D43555252454E545F414C4C5541084F55545F5652454607494E5F5652454605494F315F3105494F5F343204494F5F3105494F315F320A4144373739335265616400000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 1423 @@ -1828,7 +1828,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3593,34 +3593,61 @@ 0 100 - 2 + 1 ..\..\Source\App\main.c - 11 - 19 - 32 + 13 + 22 + 31 + 1 + + 0 + + + ..\..\..\driver\ad7793.c + 4 + 239 + 238 1 0 - ..\..\..\driver\24clxx.c - 11 - 106 - 272 + ..\..\..\driver\ad7793.h + 25 + 1 + 7 1 0 - ..\..\..\bus_driver\onewire_hw.c - 19 - 38 + ..\..\..\driver\ad7684.c + 1 + 76 + 90 + 1 + + 0 + + + ..\..\..\driver\ad7684.h + 6 + 1 9 1 0 + + ..\..\..\bus_driver\spi_hw.c + 32 + 261 + 271 + 1 + + 0 + diff --git a/project/Projects/MDK/Project.uvoptx b/project/Projects/MDK/Project.uvoptx index a01254d531f3e3bbc4ae8cc7b4e6e761bb5787fb..58100a2f236a8bd12e350385cb36266d81b541ec 100644 --- a/project/Projects/MDK/Project.uvoptx +++ b/project/Projects/MDK/Project.uvoptx @@ -432,6 +432,18 @@ 0 0 + + 4 + 16 + 1 + 0 + 0 + 0 + ..\..\..\driver\ad7793.c + ad7793.c + 0 + 0 + @@ -442,7 +454,7 @@ 0 5 - 16 + 17 1 0 0 @@ -454,7 +466,7 @@ 5 - 17 + 18 1 0 0 @@ -466,7 +478,7 @@ 5 - 18 + 19 1 0 0 @@ -478,7 +490,7 @@ 5 - 19 + 20 1 0 0 @@ -490,7 +502,7 @@ 5 - 20 + 21 1 0 0 @@ -502,7 +514,7 @@ 5 - 21 + 22 1 0 0 @@ -514,7 +526,7 @@ 5 - 22 + 23 1 0 0 @@ -526,7 +538,7 @@ 5 - 23 + 24 1 0 0 @@ -538,7 +550,7 @@ 5 - 24 + 25 1 0 0 @@ -550,7 +562,7 @@ 5 - 25 + 26 1 0 0 @@ -562,7 +574,7 @@ 5 - 26 + 27 1 0 0 @@ -574,7 +586,7 @@ 5 - 27 + 28 1 0 0 @@ -586,7 +598,7 @@ 5 - 28 + 29 1 0 0 @@ -598,7 +610,7 @@ 5 - 29 + 30 1 0 0 @@ -610,7 +622,7 @@ 5 - 30 + 31 1 0 0 @@ -622,7 +634,7 @@ 5 - 31 + 32 1 0 0 @@ -634,7 +646,7 @@ 5 - 32 + 33 1 0 0 @@ -646,7 +658,7 @@ 5 - 33 + 34 1 0 0 @@ -658,7 +670,7 @@ 5 - 34 + 35 1 0 0 @@ -670,7 +682,7 @@ 5 - 35 + 36 1 0 0 @@ -682,7 +694,7 @@ 5 - 36 + 37 1 0 0 @@ -694,7 +706,7 @@ 5 - 37 + 38 1 0 0 @@ -706,7 +718,7 @@ 5 - 38 + 39 1 0 0 @@ -718,7 +730,7 @@ 5 - 39 + 40 2 0 0 @@ -730,7 +742,7 @@ 5 - 40 + 41 1 0 0 diff --git a/project/Projects/MDK/Project.uvprojx b/project/Projects/MDK/Project.uvprojx index fe9e362a1df37f729cd73e052b80b7ab95f69982..958e7c971323e01c6c25b05c7f65db97dc71d04a 100644 --- a/project/Projects/MDK/Project.uvprojx +++ b/project/Projects/MDK/Project.uvprojx @@ -471,6 +471,11 @@ 1 ..\..\..\driver\24clxx.c + + ad7793.c + 1 + ..\..\..\driver\ad7793.c + diff --git a/project/Source/App/main.c b/project/Source/App/main.c index 9a13df6019486c36d6a2053d93b5ce20f901ec4b..c6f7c5635dd14ea4919a55f9c6dac474d85752b7 100644 --- a/project/Source/App/main.c +++ b/project/Source/App/main.c @@ -8,6 +8,7 @@ #include "ad5290.h" #include "tmc2660.h" #include "24clxx.h" +#include "ad7793.h" struct i2c_dev_device i2c0; struct spi_bus_device spi_bus0; @@ -26,6 +27,7 @@ int main(void) ee_25xx_init(&spi_bus1); ad7684_init(&spi_bus1); ad5290_init(&spi_bus1); + ad7793_init(&spi_bus0); tmc2660_init(&spi_bus0); ee_24clxx_init(&i2c0);