에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 68d782f8c8f50d3e6fc4e9f69c3edb0a1368acf4

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

모드버스 테이블의 온도 영역 형식 변경

Showing 2 changed files with 18 additions and 17 deletions   Show diff stats
app/app_oven_controller/app/oven_controller/main_controller.c
  Diff comments   View file @68d782f
@@ -139,7 +139,7 @@ int main ( int argc, char *argv[]) @@ -139,7 +139,7 @@ int main ( int argc, char *argv[])
139 { 139 {
140 msec_t tm_curr; 140 msec_t tm_curr;
141 141
142 - printf( "oven controller 1.0.1\n"); 142 + printf( "oven controller 1.0.2\n");
143 printf( "----------------------------------------------\n"); 143 printf( "----------------------------------------------\n");
144 144
145 poll_init(); 145 poll_init();
app/app_oven_controller/include/all_share.h
  Diff comments   View file @68d782f
@@ -22,6 +22,7 @@ typedef unsigned char U8; @@ -22,6 +22,7 @@ typedef unsigned char U8;
22 typedef unsigned short U16; 22 typedef unsigned short U16;
23 typedef unsigned int U32; 23 typedef unsigned int U32;
24 typedef unsigned long long U64; 24 typedef unsigned long long U64;
  25 +typedef signed short I16;
25 26
26 enum command_enum_t { 27 enum command_enum_t {
27 CMD_VALUE = 0, // ¿Àºì °ª º¯°æ 28 CMD_VALUE = 0, // ¿Àºì °ª º¯°æ
@@ -115,7 +116,7 @@ typedef struct { @@ -115,7 +116,7 @@ typedef struct {
115 U16 cooking; // 06 116 U16 cooking; // 06
116 U16 cleaning; // 07 117 U16 cleaning; // 07
117 U16 system; // 08 118 U16 system; // 08
118 - U16 heat; // 09 119 + I16 heat; // 09
119 U16 humidity; // 0A 120 U16 humidity; // 0A
120 U16 time; // 0B 121 U16 time; // 0B
121 U16 preheat; // 0C 122 U16 preheat; // 0C
@@ -123,7 +124,7 @@ typedef struct { @@ -123,7 +124,7 @@ typedef struct {
123 U16 innerwater; // 0E 124 U16 innerwater; // 0E
124 U16 conv_rpm; // 0F 125 U16 conv_rpm; // 0F
125 U16 cooldown; // 10 126 U16 cooldown; // 10
126 - U16 inner_temp; // 11 127 + I16 inner_temp; // 11
127 U16 reserved12; // 12 128 U16 reserved12; // 12
128 U16 reserved13; // 13 129 U16 reserved13; // 13
129 U16 clean_type; // 14 130 U16 clean_type; // 14
@@ -149,10 +150,10 @@ typedef struct { @@ -149,10 +150,10 @@ typedef struct {
149 U16 firmware_month; // 02 150 U16 firmware_month; // 02
150 U16 firmware_day; // 03 151 U16 firmware_day; // 03
151 U16 cooking_mode; // 04 152 U16 cooking_mode; // 04
152 - U16 cooking_heat; // 05 153 + I16 cooking_heat; // 05
153 U16 cooking_humidity; // 06 154 U16 cooking_humidity; // 06
154 U16 cooking_time; // 07 155 U16 cooking_time; // 07
155 - U16 curr_heat; // 08 156 + I16 curr_heat; // 08
156 U16 curr_humidity; // 09 157 U16 curr_humidity; // 09
157 U16 curr_time; // 0A 158 U16 curr_time; // 0A
158 U16 cleaning_sate; // 0B 159 U16 cleaning_sate; // 0B
@@ -171,20 +172,20 @@ typedef struct { @@ -171,20 +172,20 @@ typedef struct {
171 U16 fan2_direction; // 18 172 U16 fan2_direction; // 18
172 U16 onoff_state1; // 19 173 U16 onoff_state1; // 19
173 U16 onoff_state2; // 1A 174 U16 onoff_state2; // 1A
174 - U16 sensor1; // 1B  
175 - U16 sensor2; // 1C  
176 - U16 sensor3; // 1D  
177 - U16 sensor4; // 1E  
178 - U16 sensor5; // 1F  
179 - U16 sensor6; // 20  
180 - U16 sensor7; // 21  
181 - U16 sensor8; // 22  
182 - U16 sensor9; // 23  
183 - U16 sensor10; // 24 175 + I16 sensor1; // 1B
  176 + I16 sensor2; // 1C
  177 + I16 sensor3; // 1D
  178 + I16 sensor4; // 1E
  179 + I16 sensor5; // 1F
  180 + I16 sensor6; // 20
  181 + I16 sensor7; // 21
  182 + I16 sensor8; // 22
  183 + I16 sensor9; // 23
  184 + I16 sensor10; // 24
184 U16 sensor11; // 25 185 U16 sensor11; // 25
185 U16 sensor12; // 26 186 U16 sensor12; // 26
186 - U16 sensor13; // 27  
187 - U16 sensor14; // 28 187 + I16 sensor13; // 27
  188 + I16 sensor14; // 28
188 U16 sensor15; // 29 189 U16 sensor15; // 29
189 U16 sensor16; // 2A 190 U16 sensor16; // 2A
190 U16 onoff_relay_load; // 2B 191 U16 onoff_relay_load; // 2B