Skip to content

Add Tomcat items to LCD #38

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
emcek wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add Tomcat items to LCD #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f4dce74
add todo item
emcek Nov 2, 2021
725c55b
add some tomcat airspeed bios data
emcek Nov 10, 2021
a6502c2
Merge branch 'master' into tomcat_lcd
emcek Nov 10, 2021
b63c56a
print raw values
emcek Nov 10, 2021
b0ed5ec
Merge branch 'master' into tomcat_lcd
emcek Jan 3, 2022
1186456
Merge branch 'master' into tomcat_lcd
emcek Sep 1, 2022
e08be49
Merge branch 'master' into tomcat_lcd
emcek May 5, 2023
0ebdd03
temp disable tomcat prepare image test
emcek May 5, 2023
d9de788
Merge branch 'master' into tomcat_lcd
emcek May 18, 2023
c31e369
fix imports
emcek May 18, 2023
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
16 changes: 14 additions & 2 deletions dcspy/aircraft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from PIL import Image, ImageDraw, ImageFont

from dcspy import LcdInfo, LcdButton, LcdType, SUPPORTED_CRAFTS, DED_FONT, config, BiosValue
from dcspy import LcdInfo, LcdButton, LcdType, DED_FONT, config, BiosValue
from dcspy.sdk import lcd_sdk


Expand Down Expand Up @@ -854,7 +854,12 @@ def __init__(self, lcd_type: LcdInfo) -> None:
:param lcd_type: LCD type
"""
super().__init__(lcd_type)
# todo - add IAS (kph/mach), wing swept indication
self.bios_data: Dict[str, BiosValue] = {
'PLT_AIRSPEED_INNER': {'klass': 'IntegerBuffer', 'args': {'address': 0x1304, 'mask': 0xffff, 'shift_by': 0x0}, 'value': int()},
'PLT_AIRSPEED_NEEDLE': {'klass': 'IntegerBuffer', 'args': {'address': 0x1302, 'mask': 0xffff, 'shift_by': 0x0}, 'value': int()},
'PLT_AIRSPEED_POINTER1': {'klass': 'IntegerBuffer', 'args': {'address': 0x1306, 'mask': 0xffff, 'shift_by': 0x0}, 'value': int()},
'PLT_AIRSPEED_POINTER2': {'klass': 'IntegerBuffer', 'args': {'address': 0x1308, 'mask': 0xffff, 'shift_by': 0x0}, 'value': int()},
'RIO_CAP_CLEAR': {'klass': 'IntegerBuffer', 'args': {'address': 0x12c4, 'mask': 0x4000, 'shift_by': 0xe}, 'value': int()},
'RIO_CAP_SW': {'klass': 'IntegerBuffer', 'args': {'address': 0x12c4, 'mask': 0x2000, 'shift_by': 0xd}, 'value': int()},
'RIO_CAP_NE': {'klass': 'IntegerBuffer', 'args': {'address': 0x12c4, 'mask': 0x1000, 'shift_by': 0xc}, 'value': int()},
Expand All @@ -866,7 +871,14 @@ def _draw_common_data(self, draw: ImageDraw) -> None:

:param draw: ImageDraw instance
"""
draw.text(xy=(2, 3), text=f'{SUPPORTED_CRAFTS[self.__class__.__name__]["name"]}', fill=self.lcd.foreground, font=self.lcd.font_l)
as1 = self.get_bios('PLT_AIRSPEED_INNER')
as2 = self.get_bios('PLT_AIRSPEED_NEEDLE')
as3 = self.get_bios('PLT_AIRSPEED_POINTER1')
as4 = self.get_bios('PLT_AIRSPEED_POINTER2')

for i, line in enumerate([as1, as2, as3, as4]):
offset = i * 10
draw.text(xy=(0, offset), text=str(line), fill=self.lcd.foreground, font=self.lcd.font_s)

def draw_for_lcd_mono(self, img: Image.Image) -> None:
"""Prepare image for F-14B Tomcat for Mono LCD."""
Expand Down
4 changes: 3 additions & 1 deletion tests/test_aircraft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ def test_apatch_mode_switch_idm_pre_for_apache(plane, bios_pairs, mode, request)
# <=><=><=><=><=> Prepare Image <=><=><=><=><=>

@mark.parametrize('lcd', ['mono', 'color'])
@mark.parametrize('model', ['hornet', 'viper', 'shark', 'shark3', 'hip', 'hind', 'apache', 'warthog', 'warthog2', 'tomcata', 'tomcatb', 'harrier'])
@mark.parametrize('model', ['hornet', 'viper', 'shark', 'shark3', 'hip', 'hind', 'apache', 'warthog', 'warthog2',
# 'tomcata', 'tomcatb',
'harrier'])
def test_prepare_image_for_all_planes(model, lcd, request):
aircraft_model = request.getfixturevalue(f'{model}_{lcd}')
bios_pairs = request.getfixturevalue(f'{model}_{lcd}_bios')
Expand Down