Skip to content

Improvements in case of negative speed and current #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strijar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improvements in case of negative speed and current #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dad6abb
Improvements in case of negative speed and current
strijar Sep 3, 2025
0c81731
Typo corrected
strijar Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/com/cooper/wheellog/utils/GotwayAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,14 @@ public boolean decode(byte[] data) {
appConfig.setTrick(buff[16]);
}
int hwPwm = MathsUtil.signedShortFromBytesBE(buff, 14) * 10;
speed = Math.abs(speed);
if (gotwayNegative == 0) {
speed = Math.abs(speed);
phaseCurrent = Math.abs(phaseCurrent);
hwPwm = Math.abs(hwPwm);
} else {
phaseCurrent = phaseCurrent * gotwayNegative;
if (!bIsAlexovikFW)
{
speed = speed * gotwayNegative;
hwPwm = hwPwm * gotwayNegative;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/cooper/wheellog/utils/VeteranAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ public boolean decode(byte[] data) {
}
} else battery = 1; // for new wheels, set 1% by default

speed = Math.abs(speed);

if (veteranNegative == 0) {
speed = Math.abs(speed);
phaseCurrent = Math.abs(phaseCurrent);
} else {
speed = speed * veteranNegative;
phaseCurrent = phaseCurrent * veteranNegative;
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@
<string name="integral_d_current_factor_decsription">Интегральный коэффициент тока D двигателя.</string>
<string name="battery_voltage_title">Напряжение батареи</string>
<string name="battery_voltage_description">67В/84В/100В</string>
<string name="gotway_negative_title">Отрицательный ток и скорость</string>
<string name="gotway_negative_description">Когда вы едете прямо, если скорость и ток отрицательные - попробуйте изменить настройку на противоположную или выберите абсолютное значение</string>
<string name="gotway_negative_title">Отрицательный ток</string>
<string name="gotway_negative_description">Когда вы едете прямо, если ток отрицательный - попробуйте изменить настройку на противоположную или выберите абсолютное значение</string>
<string name="absolute">Абсолютный (всегда положительный)</string>
<string name="reverse">Обратный</string>
<string name="straight">Прямой</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-uk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@
<string name="auto_upload_log_ec_description">Автоматичне завантаження логу. Потрібно увімкнути GPS.</string>
<string name="ks18l_scaler_title">Корегування одометру 18L</string>
<string name="ks18l_scaler_description">Якщо Ваш 18L неправильно відображає дистанцію - виберіть даний пункт</string>
<string name="gotway_negative_title">Дзеркальний режим сили струму та напруги</string>
<string name="gotway_negative_description">Якщо заначення напруги та сили струму відображається навапаки - спробуйте даний параметр</string>
<string name="gotway_negative_title">Дзеркальний режим напруги</string>
<string name="gotway_negative_description">Якщо заначення напруги відображається навапаки - спробуйте даний параметр</string>
<string name="absolute">Абсолютне значення</string>
<string name="reverse">Реверс</string>
<string name="straight">Нормальний режим</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@
<string name="integral_d_current_factor_decsription">Integral current factor D of the motor.</string>
<string name="battery_voltage_title">Battery voltage</string>
<string name="battery_voltage_description">67V/84V/100V/116V/134V/168V</string>
<string name="gotway_negative_title">Negative current and speed mode</string>
<string name="gotway_negative_description">When you riding straight if speed and currents negative - try change to opposite setting, or choose absolute</string>
<string name="gotway_negative_title">Negative current mode</string>
<string name="gotway_negative_description">When you riding straight if currents negative - try change to opposite setting, or choose absolute</string>
<string name="hw_pwm_title">Use hardware PWM instead of software</string>
<string name="hw_pwm_description">Modern versions of Veteran firmware support PWM transmission in protocol, switch to activate</string>
<string name="absolute">Absolute (only positive)</string>
Expand Down