프로토콜 변경 대응

- 모델 유형 설정 추가 (전기식/가스식, 단 설정)

프로토콜 변경 대응
- 모델 유형 설정 추가 (전기식/가스식, 단 설정)
김태훈
1 parent aa759e27a7
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c
app/app-prime-modbus/include/all_share.h
@@ -238,6 +238,8 @@ static void set_value( command_t *pcmd){
     case TG_BURNER1_2_RPM   : addr = 0x29; break;
     case TG_BURNER23_1_RPM  : addr = 0x2A; break;
     case TG_BURNER23_2_RPM  : addr = 0x2B; break;
+    case TG_PRODUCT_TYPE    : addr = 0x2C; break;
+    case TG_MODEL_TYPE      : addr = 0x2D; break;
     case TG_ERROR_CLEAR     : addr = 0x31; break;
     }
  
@@ -50,6 +50,8 @@ enum target_value_t {
     TG_BURNER1_2_RPM,
     TG_BURNER23_1_RPM,
     TG_BURNER23_2_RPM,
+    TG_PRODUCT_TYPE,
+    TG_MODEL_TYPE,
     TG_ERROR_CLEAR
 };
  
@@ -157,8 +159,8 @@ typedef struct {
     U16     burner1_2_rpm;          // 29
     U16     burner23_1_rpm;         // 2A
     U16     burner23_2_rpm;         // 2B
-    U16     reserved2c;             // 2C
-    U16     reserved2d;             // 2D
+    U16     product_type;           // 2C
+    U16     model_type;             // 2D
     U16     reserved2e;             // 2E
     U16     reserved2f;             // 2F
     U16     reserved30;             // 30
...	...	@@ -238,6 +238,8 @@ static void set_value( command_t *pcmd){
238	238	case TG_BURNER1_2_RPM : addr = 0x29; break;
239	239	case TG_BURNER23_1_RPM : addr = 0x2A; break;
240	240	case TG_BURNER23_2_RPM : addr = 0x2B; break;
	241	+ case TG_PRODUCT_TYPE : addr = 0x2C; break;
	242	+ case TG_MODEL_TYPE : addr = 0x2D; break;
241	243	case TG_ERROR_CLEAR : addr = 0x31; break;
242	244	}
243	245
...	...
...	...	@@ -50,6 +50,8 @@ enum target_value_t {
50	50	TG_BURNER1_2_RPM,
51	51	TG_BURNER23_1_RPM,
52	52	TG_BURNER23_2_RPM,
	53	+ TG_PRODUCT_TYPE,
	54	+ TG_MODEL_TYPE,
53	55	TG_ERROR_CLEAR
54	56	};
55	57
...	...	@@ -157,8 +159,8 @@ typedef struct {
157	159	U16 burner1_2_rpm; // 29
158	160	U16 burner23_1_rpm; // 2A
159	161	U16 burner23_2_rpm; // 2B
160		- U16 reserved2c; // 2C
161		- U16 reserved2d; // 2D
	162	+ U16 product_type; // 2C
	163	+ U16 model_type; // 2D
162	164	U16 reserved2e; // 2E
163	165	U16 reserved2f; // 2F
164	166	U16 reserved30; // 30
...	...