Skip to content

Commit

Permalink
Merge pull request #2525 from jmichelp/dev
Browse files Browse the repository at this point in the history
Print LUA and Python interpreter versions
  • Loading branch information
iceman1001 authored Sep 22, 2024
2 parents 2b1a71b + d68bdda commit a3871cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...

## [unreleased][unreleased]
- Print LUA and Python versions in `hw version` command (@jmichelp)
- Updated LUA to v5.4.7 which adds utf-8 support (@jmichelp)
- Changed `lf search` - it now tries to read and decode paxton id (@iceman1001)
- Changed `lf search` - to identify hitag2/s/82xx in chipset detection to preserve their EM4100 or other outputs (@iceman1001)
Expand Down
9 changes: 8 additions & 1 deletion client/src/cmdhw.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include <string.h>
#include <ctype.h>

#ifdef HAVE_PYTHON
#include <Python.h>
#endif

#include "cmdparser.h" // command_t
#include "cliparser.h"
#include "comms.h"
Expand All @@ -41,6 +45,8 @@
#include "proxgui.h"
#include "graph.h" // for graph data

#include "lua.h"

static int CmdHelp(const char *Cmd);

static void lookup_chipid_short(uint32_t iChipID, uint32_t mem_used) {
Expand Down Expand Up @@ -1667,7 +1673,7 @@ void pm3_version(bool verbose, bool oneliner) {
PrintAndLogEx(NORMAL, " native BT support......... " _YELLOW_("absent"));
#endif
#ifdef HAVE_PYTHON
PrintAndLogEx(NORMAL, " Python script support..... " _GREEN_("present"));
PrintAndLogEx(NORMAL, " Python script support..... " _GREEN_("present") " (" _YELLOW_(PY_VERSION) ")");
#else
PrintAndLogEx(NORMAL, " Python script support..... " _YELLOW_("absent"));
#endif
Expand All @@ -1676,6 +1682,7 @@ void pm3_version(bool verbose, bool oneliner) {
#else
PrintAndLogEx(NORMAL, " Lua SWIG support.......... " _YELLOW_("absent"));
#endif
PrintAndLogEx(NORMAL, " Lua runtime version....... " _GREEN_(LUA_RELEASE));
#ifdef HAVE_PYTHON_SWIG
PrintAndLogEx(NORMAL, " Python SWIG support....... " _GREEN_("present"));
#else
Expand Down

0 comments on commit a3871cd

Please sign in to comment.