에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 174377d7c8e57122f2de89e2548a82887a2f318d

Authored by 김태훈
1 parent 5228da6302
Exists in master and in 2 other branches fhd, fhd-demo

프로토콜 추가 후 모드버스로 다 읽지 않는 문제 수정

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c
  Diff comments   View file @174377d
... ... @@ -468,7 +468,7 @@ static void on_rcv_status( void){
468 468 // ���� ó��
469 469  
470 470 oven.header = HDR_OVEN_STATE;
471   - memcpy( ( char *)&oven.state, &rx_data[3], 0x32 * 2); // 0x32 : ���� ���� ���� 2����Ʈ ����
  471 + memcpy( ( char *)&oven.state, &rx_data[3], sizeof(oven_state_t) - sizeof(oven.state.error_cnt)); // 0x32 : ���� ���� ���� 2����Ʈ ����
472 472  
473 473 bit_onoff21 = oven.state.onoff_state1; // ���� ���� ���¸� �ݿ�
474 474 bit_onoff22 = oven.state.onoff_state2; // ���� ���� ���¸� �ݿ�
... ... @@ -697,9 +697,9 @@ static void run_step_work( int n_step){
697 697 msleep( 50); // ���� ��� ��û ���� ���� ������ ������ �� �Ǵ� ��찡 ����
698 698  
699 699 switch( step_work){
700   - case STEP_CONTROL : modbus_func03( 0x00, 0x00, sizeof( oven_control_t) /2); break; // ������ ��û ���� /2: word ������ ����, 2���� ��û�ϸ� 4 ����Ʈ ����
701   - case STEP_STATE : modbus_func04( 0x00, 0x00, 0x32 ); break; // oven_stae_t�� error_cnt[] ������ �־ ���� �Է�
702   - case STEP_CHECK : check_gui_cmd(); break; // GUI ��û Ȯ��
  700 + case STEP_CONTROL : modbus_func03( 0x00, 0x00, sizeof( oven_control_t) /2); break; // ������ ��û ���� /2: word ������ ����, 2���� ��û�ϸ� 4 ����Ʈ ����
  701 + case STEP_STATE : modbus_func04( 0x00, 0x00, (sizeof( oven_state_t) - sizeof(U16) * 16) /2); break; // oven_stae_t�� error_cnt[] ������ �־ ���� �Է�
  702 + case STEP_CHECK : check_gui_cmd(); break; // GUI ��û Ȯ��
703 703 default :
704 704 msleep( 100); // 100mm sec �޽�, ��� ���� ����
705 705 run_next_step_work(); // ���� STEP ����
... ...