From: Urban Wallasch Date: Sun, 4 Aug 2019 10:53:48 +0000 (+0200) Subject: * Added effective throttle channel to telemetry. X-Git-Tag: v0.1.0~39 X-Git-Url: https://git.packet-gain.de/?a=commitdiff_plain;h=c5dedc28c23812b46472b925561818f37b8e61fa;p=ets2_tele.git * Added effective throttle channel to telemetry. --- diff --git a/tele2json.c b/tele2json.c index 7560830..c5abdb2 100644 --- a/tele2json.c +++ b/tele2json.c @@ -38,6 +38,7 @@ size_t tele2json( char *buf, size_t size, const struct telemetry_state_t *tele ) n += snprintf( buf+n, size-n, " \"gear_disp\": %"PRIi32",\n", tele->gear_disp ); CHKSIZE; n += snprintf( buf+n, size-n, " \"gear_fwdcnt\": %"PRIu32",\n", tele->truck_fwd_gear_cnt ); CHKSIZE; n += snprintf( buf+n, size-n, " \"clutch_eff\": %.12f,\n", tele->clutch_eff ); CHKSIZE; + n += snprintf( buf+n, size-n, " \"throttle_eff\": %.12f,\n", tele->throttle_eff ); CHKSIZE; n += snprintf( buf+n, size-n, " \"shifter\": %"PRIi32",\n", tele->shifter ); CHKSIZE; n += snprintf( buf+n, size-n, " \"fuel\": %.12f,\n", tele->fuel ); CHKSIZE; diff --git a/telemetry.h b/telemetry.h index aad946e..9a3238b 100644 --- a/telemetry.h +++ b/telemetry.h @@ -44,6 +44,7 @@ struct telemetry_state_t { int32_t gear; // engine gear int32_t gear_disp; // displayed gear double clutch_eff; // effective clutch + double throttle_eff; // effective throttle int32_t shifter; // 0 = automatic, 1 = manual double fuel; // fuel amount in l diff --git a/teleshmem.cpp b/teleshmem.cpp index 7060617..ed6faf9 100644 --- a/teleshmem.cpp +++ b/teleshmem.cpp @@ -591,6 +591,7 @@ SCSAPI_RESULT scs_telemetry_init(const scs_u32_t version, const scs_telemetry_in && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_engine_gear, SCS_U32_NIL, SCS_VALUE_TYPE_s32, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_s32, &telemetry->gear) == SCS_RESULT_ok) && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_displayed_gear, SCS_U32_NIL, SCS_VALUE_TYPE_s32, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_s32, &telemetry->gear_disp) == SCS_RESULT_ok) && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_effective_clutch, SCS_U32_NIL, SCS_VALUE_TYPE_double, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_double, &telemetry->clutch_eff) == SCS_RESULT_ok) + && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_effective_throttle, SCS_U32_NIL, SCS_VALUE_TYPE_double, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_double, &telemetry->throttle_eff) == SCS_RESULT_ok) && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_fuel, SCS_U32_NIL, SCS_VALUE_TYPE_double, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_double, &telemetry->fuel) == SCS_RESULT_ok) && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_fuel_warning, SCS_U32_NIL, SCS_VALUE_TYPE_bool, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_bool, &telemetry->fuel_warn) == SCS_RESULT_ok) && (version_params->register_for_channel(SCS_TELEMETRY_TRUCK_CHANNEL_fuel_average_consumption, SCS_U32_NIL, SCS_VALUE_TYPE_double, SCS_TELEMETRY_CHANNEL_FLAG_none, telemetry_store_double_nz, &telemetry->fuel_avg) == SCS_RESULT_ok)