프로토콜 변경 반영

김태훈
1 parent 5e7738dac4
Showing 2 changed files with 21 additions and 6 deletions Show diff stats
app/app_oven_controller/app/oven_controller/rs485_serial.c
app/app_oven_controller/include/all_share.h
@@ -233,6 +233,7 @@ static void set_value( command_t *pcmd){
     case TG_FAN2_RPM        : addr = 0x1e; break;
     case TG_FAN1_DIRECTOIN  : addr = 0x1f; break;
     case TG_FAN2_DIRECTOIN  : addr = 0x20; break;
+    case TG_ERROR_CLEAR     : addr = 0x31; break;
     }
     int value_high  = ( pcmd->value >> 8) & 0xff;
@@ -491,8 +492,6 @@ static void on_rcv_status( void){
         oven_error_bit = oven.state.system_error;                   // ¿¡·¯ ºñÆ® °ª º¯°æ
     }
-
-
     printf( "onoff_state1       = 0x%04x\n", oven.state.onoff_state1);
     printf( "onoff_state2       = 0x%04x\n", oven.state.onoff_state2);
     printf( "onoff_realy_load   = 0x%04x\n", oven.state.onoff_relay_load);
@@ -44,7 +44,8 @@ enum target_value_t {
     TG_FAN1_RPM,
     TG_FAN2_RPM,
     TG_FAN1_DIRECTOIN,
-    TG_FAN2_DIRECTOIN
+    TG_FAN2_DIRECTOIN,
+    TG_ERROR_CLEAR
 };
 enum target_onoff_t {
@@ -142,6 +143,21 @@ typedef struct {
     U16     fan2_direction;         // 20
     U16     manual_onoff21;         // 21
     U16     manual_onoff22;         // 22
+    U16     reserved23;             // 23
+    U16     reserved24;             // 24
+    U16     reserved25;             // 25
+    U16     reserved26;             // 26
+    U16     reserved27;             // 27
+    U16     reserved28;             // 28
+    U16     reserved29;             // 29
+    U16     reserved2a;             // 2A
+    U16     reserved2b;             // 2B
+    U16     reserved2c;             // 2C
+    U16     reserved2d;             // 2D
+    U16     reserved2e;             // 2E
+    U16     reserved2f;             // 2F
+    U16     reserved30;             // 30
+    U16     error_clear;            // 31
 } STRUCT_PACK oven_control_t;
 typedef struct {
@@ -153,7 +169,7 @@ typedef struct {
     I16     cooking_heat;           // 05
     U16     cooking_humidity;       // 06
     U16     cooking_time;           // 07
-    I16    curr_heat;              // 08
+    I16     curr_heat;              // 08
     U16     curr_humidity;          // 09
     U16     curr_time;              // 0A
     U16     cleaning_sate;          // 0B
@@ -192,8 +208,8 @@ typedef struct {
     U16     reserved2c;             // 2C
     U16     reserved2d;             // 2D
     U16     system_error;           // 2E
-    U16     reserved2f;             // 2F
-    U16     reserved30;             // 30
+    U16     communication_error;    // 2F
+    U16     sensor_error;           // 30
     U16     reserved31;             // 31
     U16     error_cnt[16];          // ¿¡·¯ Ä«¿îÆ®
 } STRUCT_PACK oven_state_t;