Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditSystem.c @ 57:e941c9e49f73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve format warnings
author Ideenmodellierer
date Thu, 09 Aug 2018 22:38:56 +0200
parents a7683f9765da
children 98b479d0618f
comparison
equal deleted inserted replaced
56:bab006305b58 57:e941c9e49f73
1155 1155
1156 text_content[0] = TXT_2BYTE; 1156 text_content[0] = TXT_2BYTE;
1157 text_content[1] = TXT2BYTE_ChargeCycles; 1157 text_content[1] = TXT2BYTE_ChargeCycles;
1158 text_content[2] = 0; 1158 text_content[2] = 0;
1159 write_label_var( 20, 800, ME_Y_LINE1, &FontT42, text_content); 1159 write_label_var( 20, 800, ME_Y_LINE1, &FontT42, text_content);
1160 snprintf(text_content,80,"%i (%i)",stateDeviceGetPointer()->batteryChargeCycles.value_int32,stateDeviceGetPointer()->batteryChargeCompleteCycles.value_int32); 1160 snprintf(text_content,80,"%ld (%ld)",stateDeviceGetPointer()->batteryChargeCycles.value_int32,stateDeviceGetPointer()->batteryChargeCompleteCycles.value_int32);
1161 write_label_var( 20, 800, ME_Y_LINE2, &FontT42, text_content); 1161 write_label_var( 20, 800, ME_Y_LINE2, &FontT42, text_content);
1162 1162
1163 translateDate(stateDeviceGetPointer()->batteryChargeCycles.date_rtc_dr, &Sdate); 1163 translateDate(stateDeviceGetPointer()->batteryChargeCycles.date_rtc_dr, &Sdate);
1164 translateDate(stateDeviceGetPointer()->batteryChargeCompleteCycles.date_rtc_dr, &Sdate2); 1164 translateDate(stateDeviceGetPointer()->batteryChargeCompleteCycles.date_rtc_dr, &Sdate2);
1165 snprintf(text_content,80,"%u.%u.20%02u (%u.%u.20%02u)",Sdate.Date,Sdate.Month,Sdate.Year, Sdate2.Date,Sdate2.Month,Sdate2.Year); 1165 snprintf(text_content,80,"%u.%u.20%02u (%u.%u.20%02u)",Sdate.Date,Sdate.Month,Sdate.Year, Sdate2.Date,Sdate2.Month,Sdate2.Year);
1188 text_content[0] = TXT_2BYTE; 1188 text_content[0] = TXT_2BYTE;
1189 text_content[1] = TXT2BYTE_NumberOfDives; 1189 text_content[1] = TXT2BYTE_NumberOfDives;
1190 text_content[2] = 0; 1190 text_content[2] = 0;
1191 write_label_var( 20, 800, ME_Y_LINE1, &FontT42, text_content); 1191 write_label_var( 20, 800, ME_Y_LINE1, &FontT42, text_content);
1192 1192
1193 snprintf(text_content,80,"%i (%i)",stateDeviceGetPointer()->diveCycles.value_int32,(stateDeviceGetPointer()->depthMaximum.value_int32 - 1000) / 100); 1193 snprintf(text_content,80,"%ld (%ld)",stateDeviceGetPointer()->diveCycles.value_int32,(stateDeviceGetPointer()->depthMaximum.value_int32 - 1000) / 100);
1194 write_label_var( 20, 800, ME_Y_LINE2, &FontT42, text_content); 1194 write_label_var( 20, 800, ME_Y_LINE2, &FontT42, text_content);
1195 1195
1196 translateDate(stateDeviceGetPointer()->diveCycles.date_rtc_dr, &Sdate); 1196 translateDate(stateDeviceGetPointer()->diveCycles.date_rtc_dr, &Sdate);
1197 translateDate(stateDeviceGetPointer()->depthMaximum.date_rtc_dr, &Sdate2); 1197 translateDate(stateDeviceGetPointer()->depthMaximum.date_rtc_dr, &Sdate2);
1198 snprintf(text_content,80,"%u.%u.20%02u (%u.%u.20%02u)",Sdate.Date,Sdate.Month,Sdate.Year, Sdate2.Date,Sdate2.Month,Sdate2.Year); 1198 snprintf(text_content,80,"%u.%u.20%02u (%u.%u.20%02u)",Sdate.Date,Sdate.Month,Sdate.Year, Sdate2.Date,Sdate2.Month,Sdate2.Year);
1201 text_content[0] = TXT_2BYTE; 1201 text_content[0] = TXT_2BYTE;
1202 text_content[1] = TXT2BYTE_HoursOfOperation; 1202 text_content[1] = TXT2BYTE_HoursOfOperation;
1203 text_content[2] = 0; 1203 text_content[2] = 0;
1204 write_label_var( 20, 800, ME_Y_LINE4, &FontT42, text_content); 1204 write_label_var( 20, 800, ME_Y_LINE4, &FontT42, text_content);
1205 1205
1206 snprintf(text_content,80,"%i",(stateDeviceGetPointer()->hoursOfOperation.value_int32)/3600); 1206 snprintf(text_content,80,"%ld",(stateDeviceGetPointer()->hoursOfOperation.value_int32)/3600);
1207 write_label_var( 20, 800, ME_Y_LINE5, &FontT42, text_content); 1207 write_label_var( 20, 800, ME_Y_LINE5, &FontT42, text_content);
1208 1208
1209 text_button[0] = TXT_2BYTE; 1209 text_button[0] = TXT_2BYTE;
1210 text_button[1] = TXT2BYTE_ButtonNext; 1210 text_button[1] = TXT2BYTE_ButtonNext;
1211 text_button[2] = 0; 1211 text_button[2] = 0;