andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-07-01 22:02:39 -04:00
parent ed2cde6869
commit c6c58a367f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/status_loop.cpp
View File

@ -580,7 +580,7 @@ static void lcdThread(void *arg) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
extern fuel_Map3D_t veMap; extern fuel_Map3D_t veMap;
extern fuel_Map3D_t afrMap; extern afr_Map3D_t afrMap;
void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_S) { void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_S) {
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)

10
firmware/controllers/algo/nmea.c
View File

@ -47,14 +47,14 @@ int str2int(char *a, int len) {
} }
float gps_deg_dec(float deg_point) { float gps_deg_dec(float deg_point) {
double ddeg; float ddeg;
double sec = modf(deg_point, &ddeg) * 60; float sec = modff(deg_point, &ddeg) * 60;
int deg = (int) (ddeg / 100); int deg = (int) (ddeg / 100);
int min = (int) (deg_point - (deg * 100)); int min = (int) (deg_point - (deg * 100));
float absdlat = round(deg * 1000000.); float absdlat = roundf(deg * 1000000.);
float absmlat = round(min * 1000000.); float absmlat = roundf(min * 1000000.);
float absslat = round(sec * 1000000.); float absslat = roundf(sec * 1000000.);
return round(absdlat + (absmlat / 60) + (absslat / 3600)) / 1000000; return round(absdlat + (absmlat / 60) + (absslat / 3600)) / 1000000;
} }