Skip to content

Commit

Permalink
libticonv, libtifiles, libticables, libticalcs: add TI-82 Advanced Ed…
Browse files Browse the repository at this point in the history 
…ition Python support.

[Lionel: reordered entries in CalcModel and CableVariant enums and therefore ticalcs.cc::calcs[] and ticalcs.cc::supported_calcs, added translation strings, added several occurrences of CALC_TI82AEP_USB / CABLE_VARIANT_TI82AEP, added function pointers in calc_82aep_usb, changed whitespace, etc.]

Signed-off-by: Jacob Young <[email protected]>
Signed-off-by: Lionel Debroux <[email protected]>
  • Loading branch information
@jacobly0 @debrouxl
jacobly0 authored and debrouxl committed Nov 12, 2023
1 parent d78124b commit 9b925ef
Show file tree
Hide file tree
Showing 27 changed files with 406 additions and 169 deletions.
8 changes: 8 additions & 0 deletions libticables/trunk/src/probe.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ void translate_usb_device_info(CableDeviceInfo *info, const USBCableInfo *usbinf
{
info->variant = CABLE_VARIANT_TI84PT;
}
else if (!strcmp(usbinfo->product_str, "TI-82 Advanced Edition Python"))
{
info->variant = CABLE_VARIANT_TI82AEP;
}
else if (usbinfo->version <= 0x0110)
{
info->variant = CABLE_VARIANT_TI84PSE;
Expand All @@ -376,6 +380,10 @@ void translate_usb_device_info(CableDeviceInfo *info, const USBCableInfo *usbinf
{
info->variant = CABLE_VARIANT_TI83PCE;
}
else if (usbinfo->version == 0x0660)
{
info->variant = CABLE_VARIANT_TI82AEP;
}
else
{
info->variant = CABLE_VARIANT_UNKNOWN;
Expand Down
3 changes: 2 additions & 1 deletion libticables/trunk/src/ticables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ typedef enum
CABLE_VARIANT_NSPIRE_CAS, /* CABLE_FAMILY_USB_NSPIRE */
CABLE_VARIANT_NSPIRE_CRADLE, /* CABLE_FAMILY_USB_NSPIRE_CRADLE */
// The CX II series doesn't seem to make it possible to distinguish its four members (three product IDs and OS versions) at the USB level.
CABLE_VARIANT_NSPIRE_CXII /* CABLE_FAMILY_USB_NSPIRE_CXII */
CABLE_VARIANT_NSPIRE_CXII, /* CABLE_FAMILY_USB_NSPIRE_CXII */
CABLE_VARIANT_TI82AEP /* CABLE_FAMILY_USB_TI8X */
} CableVariant;

/**
Expand Down
54 changes: 29 additions & 25 deletions libticalcs/trunk/po/de.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libticalcs2 1.1.10\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2023-08-07 21:47+0200\n"
"POT-Creation-Date: 2023-09-13 22:08+0200\n"
"PO-Revision-Date: 2016-11-18 19:30+0300\n"
"Last-Translator: Andreas B. Mundt <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
Expand All @@ -28,7 +28,7 @@ msgstr "Dummy Hand-Held"
msgid "Dummy hand-held used when no calc is set"
msgstr "Dummy Hand-Held verwendet, wenn kein calc gesetzt ist"

#: src/calc_73.cc:390 src/calc_84p.cc:302 src/calc_8x.cc:402
#: src/calc_73.cc:390 src/calc_84p.cc:303 src/calc_8x.cc:402
#, c-format
msgid "Parsing %s"
msgstr "Lese und analysiere %s"
Expand All @@ -49,17 +49,17 @@ msgstr "FLASH Name: \"%s\""
msgid "FLASH size: %i bytes."
msgstr "FLASH Größe: %i Bytes."

#: src/calc_73.cc:1279 src/calc_84p.cc:1430 src/calc_84p.cc:1460
#: src/calc_73.cc:1279 src/calc_84p.cc:1441 src/calc_84p.cc:1471
#: src/calc_9x.cc:1455 src/calc_89t.cc:856
msgid "Setting clock..."
msgstr "Stelle Zeit..."

#: src/calc_73.cc:1325 src/calc_84p.cc:1376 src/calc_84p.cc:1526
#: src/calc_73.cc:1325 src/calc_84p.cc:1387 src/calc_84p.cc:1537
#: src/calc_9x.cc:1499 src/calc_89t.cc:891
msgid "Getting clock..."
msgstr "Hole Zeit..."

#: src/calc_73.cc:1409 src/calc_84p.cc:1645 src/calc_8x.cc:1254
#: src/calc_73.cc:1409 src/calc_84p.cc:1656 src/calc_8x.cc:1254
#: src/calc_9x.cc:1563 src/calc_9x.cc:1595 src/calc_89t.cc:980
#: src/calc_nsp.cc:852
#, c-format
Expand Down Expand Up @@ -102,80 +102,84 @@ msgstr "Header komplett gesendet."
msgid "Receiving certificate"
msgstr "Erhalte Zertifikat"

#: src/calc_84p.cc:1390 src/calc_84p.cc:1540
#: src/calc_84p.cc:1401 src/calc_84p.cc:1551
#, c-format
msgid "Could not determine clock type: %u %u"
msgstr "Konnte Uhrentyp nicht ermitteln: %u %u"

#: src/calc_84p.cc:1399
#: src/calc_84p.cc:1410
msgid "Will set classic clock"
msgstr "Verwendet klassische Uhr"

#: src/calc_84p.cc:1458
#: src/calc_84p.cc:1469
msgid "Will set new clock"
msgstr "Verwende neue Uhr"

#: src/calc_84p.cc:1554 src/calc_89t.cc:919
#: src/calc_84p.cc:1565 src/calc_89t.cc:919
msgid "Found valid classic clock"
msgstr "Gültige klassische Uhr gefunden"

#: src/calc_84p.cc:1593 src/calc_89t.cc:958
#: src/calc_84p.cc:1604 src/calc_89t.cc:958
#, c-format
msgid "Found classic clock but failed to retrieve its parameters: %u %u %u %u"
msgstr ""
"Klassische Uhr gefunden, aber abrufen der Parameter fehlgeschlagen: %u %u %u "
"%u"

#: src/calc_84p.cc:1611
#: src/calc_84p.cc:1622
msgid "Found valid new clock"
msgstr "Gültige neue Uhr gefunden"

#: src/calc_84p.cc:1626
#: src/calc_84p.cc:1637
#, c-format
msgid ""
"Found new clock but failed to retrieve its parameters: %u %u %u %u %u %u"
msgstr ""
"Klassische Uhr gefunden, aber abrufen der Parameter fehlgeschlagen: %u %u %u "
"%u %u %u"

#: src/calc_84p.cc:1728 src/calc_89t.cc:1169
#: src/calc_84p.cc:1739 src/calc_89t.cc:1169
msgid "Getting version..."
msgstr "Hole Versionsnummer..."

#: src/calc_84p.cc:1780
#: src/calc_84p.cc:1791
msgid "That's odd, product ID and calc ID do not match ?"
msgstr "Komisch, Produkt-ID und Rechner-ID stimmen nicht überein?"

#: src/calc_84p.cc:1998 src/calc_84p.cc:2007 src/calc_84p.cc:2016
#: src/calc_84p.cc:2032 src/calc_84p.cc:2040
#: src/calc_84p.cc:2009 src/calc_84p.cc:2018 src/calc_84p.cc:2027
#: src/calc_84p.cc:2043 src/calc_84p.cc:2052 src/calc_84p.cc:2060
#, c-format
msgid "Unhandled 84+ family member with product_id=%d hw_version=%d"
msgstr "Unbekanntes 84+ Familienmitglied mit product_id=%d hw_version=%d"

#: src/calc_84p.cc:2058
#: src/calc_84p.cc:2078
msgid "TI-84 Plus thru DirectLink"
msgstr "TI-84 Plus mittels DirectLink"

#: src/calc_84p.cc:2129
#: src/calc_84p.cc:2149
msgid "TI-84 Plus C Silver Edition thru DirectLink"
msgstr "TI-84 Plus C Silver Edition mittels DirectLink"

#: src/calc_84p.cc:2200
#: src/calc_84p.cc:2220
msgid "TI-83 Premium CE thru DirectLink"
msgstr "TI-83 Premium CE mittels DirectLink"

#: src/calc_84p.cc:2271
#: src/calc_84p.cc:2291
msgid "TI-84 Plus CE thru DirectLink"
msgstr "TI-84 Plus CE mittels DirectLink"

#: src/calc_84p.cc:2342
#: src/calc_84p.cc:2362
msgid "TI-82 Advanced thru DirectLink"
msgstr "TI-82 Advanced mittels DirectLink"

#: src/calc_84p.cc:2413
#: src/calc_84p.cc:2433
msgid "TI-84 Plus T thru DirectLink"
msgstr "TI-84 Plus T mittels DirectLink"

#: src/calc_84p.cc:2504
msgid "TI-82 Advanced Edition Python thru DirectLink"
msgstr "TI-82 Advanced Edition Python mittels DirectLink"

#: src/calc_8x.cc:493 src/calc_8x.cc:803
msgid "Waiting for user's action..."
msgstr "Warte auf Aktion des Anwenders..."
Expand Down Expand Up @@ -906,16 +910,16 @@ msgstr "Rechner Typ: %s"
msgid "Unknown pixel format %d\n"
msgstr "Unbekanntes Pixel Format %d\n"

#: src/ticalcs.cc:318
#: src/ticalcs.cc:324
#, c-format
msgid "ticalcs library version %s"
msgstr "ticalcs Library Version %s"

#: src/ticalcs.cc:634
#: src/ticalcs.cc:640
msgid "Link calc handle details:"
msgstr "Verbindungs-Details:"

#: src/ticalcs.cc:635
#: src/ticalcs.cc:641
#, c-format
msgid " model : %s"
msgstr " Modell : %s"
Expand Down
54 changes: 29 additions & 25 deletions libticalcs/trunk/po/fr.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libticalcs2 1.1.10\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2023-08-07 21:47+0200\n"
"POT-Creation-Date: 2023-09-13 22:08+0200\n"
"PO-Revision-Date: 2011-12-13 19:16+0100\n"
"Last-Translator: Lionel Debroux <[email protected]>\n"
"Language-Team: Français <[email protected]>\n"
Expand All @@ -25,7 +25,7 @@ msgstr "Calculatrice vide"
msgid "Dummy hand-held used when no calc is set"
msgstr "Calculatrice vide utilisée quand aucune calculatrice n'est spécifiée"

#: src/calc_73.cc:390 src/calc_84p.cc:302 src/calc_8x.cc:402
#: src/calc_73.cc:390 src/calc_84p.cc:303 src/calc_8x.cc:402
#, c-format
msgid "Parsing %s"
msgstr "Parcourt %s"
Expand All @@ -46,17 +46,17 @@ msgstr "Nom FLASH: \"%s\""
msgid "FLASH size: %i bytes."
msgstr "Taille FLASH: %i octets."

#: src/calc_73.cc:1279 src/calc_84p.cc:1430 src/calc_84p.cc:1460
#: src/calc_73.cc:1279 src/calc_84p.cc:1441 src/calc_84p.cc:1471
#: src/calc_9x.cc:1455 src/calc_89t.cc:856
msgid "Setting clock..."
msgstr "Mise à jour de l'horloge..."

#: src/calc_73.cc:1325 src/calc_84p.cc:1376 src/calc_84p.cc:1526
#: src/calc_73.cc:1325 src/calc_84p.cc:1387 src/calc_84p.cc:1537
#: src/calc_9x.cc:1499 src/calc_89t.cc:891
msgid "Getting clock..."
msgstr "Réception de l'horloge..."

#: src/calc_73.cc:1409 src/calc_84p.cc:1645 src/calc_8x.cc:1254
#: src/calc_73.cc:1409 src/calc_84p.cc:1656 src/calc_8x.cc:1254
#: src/calc_9x.cc:1563 src/calc_9x.cc:1595 src/calc_89t.cc:980
#: src/calc_nsp.cc:852
#, c-format
Expand Down Expand Up @@ -99,82 +99,86 @@ msgstr "En-tête envoyé complètement"
msgid "Receiving certificate"
msgstr "Réception du certificat"

#: src/calc_84p.cc:1390 src/calc_84p.cc:1540
#: src/calc_84p.cc:1401 src/calc_84p.cc:1551
#, c-format
msgid "Could not determine clock type: %u %u"
msgstr "Impossible de déterminer le type d'horloge: %u %u"

#: src/calc_84p.cc:1399
#: src/calc_84p.cc:1410
msgid "Will set classic clock"
msgstr "Va régler l'horloge de type ancien"

#: src/calc_84p.cc:1458
#: src/calc_84p.cc:1469
msgid "Will set new clock"
msgstr "Va régler l'horloge de type nouveau"

#: src/calc_84p.cc:1554 src/calc_89t.cc:919
#: src/calc_84p.cc:1565 src/calc_89t.cc:919
msgid "Found valid classic clock"
msgstr "Trouvé une horloge valide de type ancien"

#: src/calc_84p.cc:1593 src/calc_89t.cc:958
#: src/calc_84p.cc:1604 src/calc_89t.cc:958
#, c-format
msgid "Found classic clock but failed to retrieve its parameters: %u %u %u %u"
msgstr ""
"Trouvé une horloge de type ancien mais impossible de récupérer ses "
"paramètres: %u %u %u %u"

#: src/calc_84p.cc:1611
#: src/calc_84p.cc:1622
msgid "Found valid new clock"
msgstr "Trouvé une horloge valide de type nouveau"

#: src/calc_84p.cc:1626
#: src/calc_84p.cc:1637
#, c-format
msgid ""
"Found new clock but failed to retrieve its parameters: %u %u %u %u %u %u"
msgstr ""
"Trouvé une horloge de type nouveau mais impossible de récupérer ses "
"paramètres: %u %u %u %u %u %u"

#: src/calc_84p.cc:1728 src/calc_89t.cc:1169
#: src/calc_84p.cc:1739 src/calc_89t.cc:1169
msgid "Getting version..."
msgstr "Récupération de la version..."

#: src/calc_84p.cc:1780
#: src/calc_84p.cc:1791
msgid "That's odd, product ID and calc ID do not match ?"
msgstr ""
"C'est bizarre, le numéro de produit et le numéro de calculatrice ne "
"correspondent pas ?"

#: src/calc_84p.cc:1998 src/calc_84p.cc:2007 src/calc_84p.cc:2016
#: src/calc_84p.cc:2032 src/calc_84p.cc:2040
#: src/calc_84p.cc:2009 src/calc_84p.cc:2018 src/calc_84p.cc:2027
#: src/calc_84p.cc:2043 src/calc_84p.cc:2052 src/calc_84p.cc:2060
#, c-format
msgid "Unhandled 84+ family member with product_id=%d hw_version=%d"
msgstr "Membre inconnu de la famille 84+ avec product_id=%d hw_version=%d"

#: src/calc_84p.cc:2058
#: src/calc_84p.cc:2078
msgid "TI-84 Plus thru DirectLink"
msgstr "TI-84 Plus via DirectLink"

#: src/calc_84p.cc:2129
#: src/calc_84p.cc:2149
msgid "TI-84 Plus C Silver Edition thru DirectLink"
msgstr "TI-84 Plus C Silver Edition via DirectLink"

#: src/calc_84p.cc:2200
#: src/calc_84p.cc:2220
msgid "TI-83 Premium CE thru DirectLink"
msgstr "TI-83 Premium CE via DirectLink"

#: src/calc_84p.cc:2271
#: src/calc_84p.cc:2291
msgid "TI-84 Plus CE thru DirectLink"
msgstr "TI-84 Plus CE via DirectLink"

#: src/calc_84p.cc:2342
#: src/calc_84p.cc:2362
msgid "TI-82 Advanced thru DirectLink"
msgstr "TI-82 Advanced via DirectLink"

#: src/calc_84p.cc:2413
#: src/calc_84p.cc:2433
msgid "TI-84 Plus T thru DirectLink"
msgstr "TI-84 Plus T via DirectLink"

#: src/calc_84p.cc:2504
msgid "TI-82 Advanced Edition Python thru DirectLink"
msgstr "TI-82 Advanced Edition Python via DirectLink"

#: src/calc_8x.cc:493 src/calc_8x.cc:803
msgid "Waiting for user's action..."
msgstr "Attente d'une action de la part de l'utilisateur..."
Expand Down Expand Up @@ -905,16 +909,16 @@ msgstr " Type de calculatrice: %s"
msgid "Unknown pixel format %d\n"
msgstr "Format de pixel %d inconnu\n"

#: src/ticalcs.cc:318
#: src/ticalcs.cc:324
#, c-format
msgid "ticalcs library version %s"
msgstr "librairie ticalcs version %s"

#: src/ticalcs.cc:634
#: src/ticalcs.cc:640
msgid "Link calc handle details:"
msgstr "Détails du descripteur de calculatrice:"

#: src/ticalcs.cc:635
#: src/ticalcs.cc:641
#, c-format
msgid " model : %s"
msgstr " modèle : %s"
Expand Down
Loading

0 comments on commit 9b925ef

Please sign in to comment.