Commit a6292f58 authored by 王佳伟's avatar 王佳伟

feat:C928_720P0.6版本,完善版本号读取,帧率修改为70FPS

parent b0512227
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.
......@@ -20,8 +20,8 @@ output\project.out: ..\source\System\dr7f701684.ld \
C:\ghs\comp_rh850\lib\rh850\libstartup.a \
C:\ghs\comp_rh850\lib\rh850\libsys.a C:\ghs\comp_rh850\lib\rh850\libarch.a
:cmdList=gmemfile output/project.out -o output/FX12_TFT_test.mem ; gsrec -e 0 -hex386 output/project.out -o output/FX12_TFT_test.hex ; gsrec -e 0 -noS5 output/project.out -o output/FX12_TFT_test.rec ; ccv850 $(FILETYPEOPTIONS) $(OBJECTS) -MD -I..\source\Driver\Clock -I..\source\Driver\RH850F1KM_S1 -I..\source\Driver\Timer -I..\source\Driver\TimerB -I..\source\Driver\Analog_Signals -I..\source\Driver\CAN -I..\source\Driver\GPIO -I..\source\System -I..\source\Appliciation -I..\source\FCL -I..\source\EEL -I..\source\eel_user -I..\source\fdl_user -I..\source\FDL -I..\source\EEL\lib -I..\source\FDL\lib -object_dir=.\obj -map -gsize -e _RESET -Mx -bsp generic -callgraph -dwarf2 -D__GHS__ -cpu=rh850g3kh -fhard -DPlatform_RH850 -DPlatform_32Bit -nothreshold -g --diag_suppress 1 --diag_suppress 9 --diag_suppress 177 --diag_suppress 550 --diag_suppress 188 -registermode=32 -data_bus_width=32 -Onone -japanese_automotive_c -top_project Z:\D\test\c928_test\ghs\c928_test.gpj -o output\project.out ;
:cmdHash=0x0c3d3c89
:cmdList=gmemfile output/project.out -o output/FX12_TFT_test.mem ; gsrec -e 0 -hex386 output/project.out -o output/FX12_TFT_test.hex ; gsrec -e 0 -noS5 output/project.out -o output/FX12_TFT_test.rec ; ccv850 $(FILETYPEOPTIONS) $(OBJECTS) -MD -I..\source\Driver\Clock -I..\source\Driver\RH850F1KM_S1 -I..\source\Driver\Timer -I..\source\Driver\TimerB -I..\source\Driver\Analog_Signals -I..\source\Driver\CAN -I..\source\Driver\GPIO -I..\source\System -I..\source\Appliciation -I..\source\FCL -I..\source\EEL -I..\source\eel_user -I..\source\fdl_user -I..\source\FDL -I..\source\EEL\lib -I..\source\FDL\lib -object_dir=.\obj -map -gsize -e _RESET -Mx -bsp generic -callgraph -dwarf2 -D__GHS__ -cpu=rh850g3kh -fhard -DPlatform_RH850 -DPlatform_32Bit -nothreshold -g --diag_suppress 1 --diag_suppress 9 --diag_suppress 177 --diag_suppress 550 --diag_suppress 188 -registermode=32 -data_bus_width=32 -Onone -japanese_automotive_c -top_project Z:\D\װ\c928&G393\c928\ghs\c928_test.gpj -o output\project.out ;
:cmdHash=0xc11d1af5
:objList=obj\RTE_PWM.o obj\RTE_WDT.o obj\Internal_EEPROM.o obj\RTE_Memory.o obj\Internal_FCL.o obj\Clock.o obj\WDT.o obj\rh850_macros.o obj\Sys_Tick.o obj\ADC.o obj\Analog_Circuits.o obj\Analog_Signals.o obj\TimerB.o obj\RSCAN_Table.o obj\RSCAN.o obj\GPIO.o obj\UART.o obj\RIIC.o obj\Simulated_8080.o obj\TFT_LCD.o obj\TM035HFZGZx.o obj\r_clkc.o obj\fcl_ctrl.o ..\source\System\dr7f701684.ld obj\init.o obj\interrupts.o obj\main.o obj\dr7f701684_startup.o obj\r_fcl_hw_access_asm.o obj\r_fcl_hw_access.o obj\r_fcl_user_if.o obj\fcl_descriptor.o obj\fcl_user.o obj\fdl_descriptor.o obj\fdl_user.o obj\r_fdl_hw_access.o obj\r_fdl_user_if.o obj\r_fdl_user_if_init.o obj\eel_descriptor.o obj\eelapp_control.o obj\r_eel_basic_fct.o obj\r_eel_user_if.o obj\BSP.o obj\TimeStamp.o obj\RH850_OTA.o obj\fx12_test.o obj\Display_Info.o ;
:objHash=0x839e93ac
......
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.
No preview for this file type
output\project.out .intvect 1944
output\project.out .rodata 18445
output\project.out .text 78814
output\project.out .rodata 19925
output\project.out .text 80654
output\project.out .R_FCL_CODE_ROM 894
output\project.out .R_FCL_CONST 19
output\project.out .R_FCL_CODE_USR 246
......@@ -13,4 +13,4 @@ output\project.out .R_EEL_Text 18394
output\project.out .R_EEL_Const 43
output\project.out .secinfo 120
output\project.out .syscall 6
output\project.out .romdata 385
output\project.out .romdata 469
#include "RIIC.h"
#include "dr7f701684.dvf.h"
#include "rh850_macros.h"
#define RIIC_WAIT_MAX 0XFFFFF0UL
#define RIIC_WAIT_MAX 0X0FFFFUL
#define RIIC_GPIO_PROTECTED_WRITE(preg, pstatus, reg, value) \
do \
{ \
......
......@@ -308,6 +308,26 @@ void Clear_TOUCH_IRQHandler_flag(void)
{
TOUCH_IRQHandler_flag = 0;
}
void AIM951_i2c_send_check(uint8_t addr, uint8_t data)
{
uint8_t write_count = 0;
uint8_t receive_data = 0;
while(write_count < 3)
{
write_count ++;
AIM951_i2c_send(addr,data);
AIM951_i2c_sendreceive(addr,&receive_data);
if(receive_data == data)
{
write_count = 0;
break;
}
}
if(write_count == 3)
{
software_reset();
}
}
void AIM951_i2c_send(uint8_t addr, uint8_t data)
{
......@@ -321,7 +341,7 @@ void AIM951_i2c_send(uint8_t addr, uint8_t data)
}
void AIM951_i2c_sendreceive(uint8_t sendreceive_addr,uint8_t *receive_data)
{
unsigned char sendreceive_addr_buf[1];
unsigned char sendreceive_addr_buf[1];
sendreceive_addr_buf[0] =sendreceive_addr;
RIIC0_Master_SendRecvMultiByte_Interrupt(BU956_I2C_DEVICE_ID, sendreceive_addr_buf, 1, receive_data,1);
RIIC0_WaitForBusy_Block();
......@@ -332,96 +352,97 @@ void switch_951_init(uint8_t work_mode)
{
if (work_mode == 0)
{
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send(0x08, 0xAC);
AIM951_i2c_send(0x68, 0x02);
AIM951_i2c_send(0x04, 0x70);
AIM951_i2c_send(0xFF, 0x05);
AIM951_i2c_send(0x1B, 0x00);
AIM951_i2c_send(0x1F, 0x08);
AIM951_i2c_send(0xFF, 0x08);
AIM951_i2c_send(0x88, 0x1F);
AIM951_i2c_send(0xFF, 0x04);
AIM951_i2c_send(0x03, 0x50);
AIM951_i2c_send(0xFF, 0x03);
AIM951_i2c_send(0x03, 0x50);
//AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF,0x00);
AIM951_i2c_send_check(0x08, 0xAC);
AIM951_i2c_send_check(0x68, 0x02);
AIM951_i2c_send_check(0x04, 0x70);
AIM951_i2c_send_check(0xFF, 0x05);
AIM951_i2c_send_check(0x1B, 0x00);
AIM951_i2c_send_check(0x1F, 0x08);
AIM951_i2c_send_check(0xFF, 0x08);
AIM951_i2c_send_check(0x88, 0x1F);
AIM951_i2c_send_check(0xFF, 0x04);
AIM951_i2c_send_check(0x03, 0x50);
AIM951_i2c_send_check(0xFF, 0x03);
AIM951_i2c_send_check(0x03, 0x50);
// 1112
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x44, 0x0A);
BSP_Delay_ms(10);
AIM951_i2c_send(0x50, 0xC0);
AIM951_i2c_send_check(0x44, 0x0A);
BSP_Delay_ms(10);
AIM951_i2c_send(0x51, 0x30);
AIM951_i2c_send_check(0x50, 0xC0);
BSP_Delay_ms(10);
AIM951_i2c_send(0x3B, 0x4C);
AIM951_i2c_send_check(0x51, 0x30);
BSP_Delay_ms(10);
AIM951_i2c_send_check(0x3B, 0x4C);
BSP_Delay_ms(10);
// 951 iic mapping
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0E, 0x34);
AIM951_i2c_send_check(0x0E, 0x34);
BSP_Delay_ms(10);
AIM951_i2c_send(0x16, 0x34);
AIM951_i2c_send_check(0x16, 0x34);
BSP_Delay_ms(10);
// INTB init
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x93, 0x10);
AIM951_i2c_send_check(0x93, 0x10);
BSP_Delay_ms(10);
AIM951_i2c_send(0x5C, 0x21);
AIM951_i2c_send_check(0x5C, 0x21);
BSP_Delay_ms(10);
// 951 init end
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x04, 0x50);
AIM951_i2c_send_check(0x04, 0x50);
BSP_Delay_ms(10);
AIM951_i2c_send(0x3B, 0xCC);
AIM951_i2c_send_check(0x3B, 0xCC);
BSP_Delay_ms(10);
// 951 patternGen 1920*720P60 1222 mode
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x5F, 0x60);
AIM951_i2c_send_check(0x5F, 0x60);
BSP_Delay_ms(10);
AIM951_i2c_send(0x84, 0x14);
AIM951_i2c_send_check(0x84, 0x11);
BSP_Delay_ms(10);
AIM951_i2c_send(0x8C, 0x01);
AIM951_i2c_send_check(0x8C, 0x01);
BSP_Delay_ms(10);
AIM951_i2c_send(0x47, 0x4F);
AIM951_i2c_send_check(0x47, 0x4F);
BSP_Delay_ms(10);
AIM951_i2c_send(0xFF, 0x01);
AIM951_i2c_send_check(0xFF, 0x01);
BSP_Delay_ms(10);
AIM951_i2c_send(0x07, 0x10);
AIM951_i2c_send_check(0x07, 0x10);
BSP_Delay_ms(10);
AIM951_i2c_send(0x08, 0xF8);
AIM951_i2c_send_check(0x08, 0xF8);
BSP_Delay_ms(10);
AIM951_i2c_send(0x09, 0x82);
AIM951_i2c_send_check(0x09, 0x82);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0A, 0x80);
AIM951_i2c_send_check(0x0A, 0x80);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0B, 0xD0);
AIM951_i2c_send_check(0x0B, 0xD0);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0C, 0x72);
AIM951_i2c_send_check(0x0C, 0x72);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0D, 0x28);
AIM951_i2c_send_check(0x0D, 0x24);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0E, 0x0A);
AIM951_i2c_send_check(0x0E, 0x18);
BSP_Delay_ms(10);
AIM951_i2c_send(0x0F, 0x28);
AIM951_i2c_send_check(0x0F, 0x36);
BSP_Delay_ms(10);
AIM951_i2c_send(0x10, 0x0A);
AIM951_i2c_send_check(0x10, 0x08);
BSP_Delay_ms(10);
AIM951_i2c_send(0x11, 0x03);
AIM951_i2c_send_check(0x11, 0x03);
BSP_Delay_ms(10);
AIM951_i2c_send(0x02, 0x44);
AIM951_i2c_send_check(0x02, 0x44);
BSP_Delay_ms(10);
AIM951_i2c_send(0x00, 0x05);
AIM951_i2c_send_check(0x00, 0x05);
AIM951_i2c_send(0xFF, 0x00);
AIM951_i2c_send_check(0xFF, 0x00);
BSP_Delay_ms(10);
AIM951_i2c_send(0x31, 0x33);
AIM951_i2c_send_check(0x31, 0x33);
BSP_Delay_ms(10);
GPIO_OUT_PORT08_PIN12 = 1U;
......
......@@ -104,6 +104,7 @@ void init_951(void);
void switch_951_init(uint8_t work_mode);
void switch_951_Color(uint8_t in);
void AIM951_i2c_send(uint8_t addr, uint8_t data);
void AIM951_i2c_send_check(uint8_t addr, uint8_t data);
void AIM951_i2c_sendreceive(uint8_t sendreceive_addr,uint8_t *receive_data);
void touch_IRQ_Enable(void);
#endif // __BSP_H__
......
......@@ -3,7 +3,7 @@
extern const unsigned char gImage_BG_test[];//背景
extern const unsigned char gImage_BG_test_A[];//背景
extern const unsigned char *D[]; //D 指大号数字和A-F
extern const unsigned char *D[]; //D 指大号数字和A-Z
extern const unsigned char gImage_D_GX9_Y9[];//版本号的点
extern const unsigned char *gImage_point_up[];//界面选择
extern const unsigned char *gImage_point_right[];//仪表选择
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment