eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

add uarttachoscale config

Browse Source
This commit is contained in:
milek7
2019-08-31 00:28:24 +02:00
parent 63d9d02c5a
commit 6f010379b2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Globals.cpp
View File

@@ -686,6 +686,10 @@ global_settings::ConfigParse(cParser &Parser) {
>> uart_conf.currentmax >> uart_conf.currentmax
>> uart_conf.currentuart; >> uart_conf.currentuart;
} }
else if ( token == "uarttachoscale" ) {
Parser.getTokens( 1 );
Parser >> uart_conf.tachoscale;
}
else if( token == "uartfeature" ) { else if( token == "uartfeature" ) {
Parser.getTokens( 4 ); Parser.getTokens( 4 );
Parser Parser

8
uart.cpp
View File

@@ -234,7 +234,7 @@ void uart_input::poll()
// TODO: ugly! move it into structure like input_bits // TODO: ugly! move it into structure like input_bits
auto const trainstate = t->get_state(); auto const trainstate = t->get_state();
uint8_t tacho = Global.iPause ? 0 : trainstate.velocity; uint16_t tacho = Global.iPause ? 0 : (trainstate.velocity * conf.tachoscale);
uint16_t tank_press = (uint16_t)std::min(conf.tankuart, trainstate.reservoir_pressure * 0.1f / conf.tankmax * conf.tankuart); uint16_t tank_press = (uint16_t)std::min(conf.tankuart, trainstate.reservoir_pressure * 0.1f / conf.tankmax * conf.tankuart);
uint16_t pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart); uint16_t pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart);
uint16_t brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart); uint16_t brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart);
@@ -244,10 +244,8 @@ void uart_input::poll()
uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2] / conf.currentmax * conf.currentuart); uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2] / conf.currentmax * conf.currentuart);
std::array<uint8_t, 31> buffer { std::array<uint8_t, 31> buffer {
//byte 0 //byte 0-1
tacho, SPLIT_INT16(tacho),
//byte 1
0,
//byte 2 //byte 2
(uint8_t)( (uint8_t)(
trainstate.ventilator_overload << 1 trainstate.ventilator_overload << 1

1
uart.h
View File

@@ -27,6 +27,7 @@ public:
float hvuart = 65535.0f; float hvuart = 65535.0f;
float currentmax = 10000.0f; float currentmax = 10000.0f;
float currentuart = 65535.0f; float currentuart = 65535.0f;
float tachoscale = 1.0f;
bool mainenable = true; bool mainenable = true;
bool scndenable = true; bool scndenable = true;