Merge pull request #59 from JayFoxRox/xboxpy

Remove xbox module and use xboxpy in all scripts

python-scripts/README.md

@@ -1,21 +1,10 @@
-# Xbox python scripts
+# Xbox Python-Scripts
 
 This is a collection of scripts to access various Xbox hardware.
 
 
-## Usage for updated scripts
+## Getting Started
 
-[Install xboxpy](https://github.com/XboxDev/xboxpy) and read its usage documentation.
-Once you configured your xboxpy connection, you should be able to run these scripts.
-
-
-## Usage for legacy scripts
+[Install xboxpy](https://github.com/XboxDev/xboxpy#install) and read its usage documentation.
 
-* All stuff is internally imported by the `xbox` module. So: `import xbox`
-* You can define the interface you want to use using environment variable 'XBOX_IF':
-  * 'XBDM' (default)
-  * 'nxdk-rdt`
-  * 'gdb' (auto-detected if the `gdb` module exists)
-* Some interfaces will also allow you to specify the target Xbox using the 'XBOX' environment variable ('Host:Port')
-
-Not all interfaces support all functionality at this point.
+Once you configured your xboxpy connection, you should be able to run these scripts.

python-scripts/dsp_homebrew.py

@@ -3,7 +3,7 @@
 # Run this from a clean Xbox environment (= not while a game is running)
 # NXDK-RDT is a good environment
 
-from xboxpy.xboxpy import *
+from xboxpy import *
 
 import sys
 import time

python-scripts/dvd_info.py

@@ -6,7 +6,7 @@
 # http://xboxdevwiki.net/Xbox_Game_Disc
 
 
-from xbox import *
+from xboxpy import *
 
 
 #FIXME: Move these libc style functions to some helper module?

python-scripts/get_av_settings.py

@@ -6,7 +6,7 @@
 # http://xboxdevwiki.net/AV_Cables#Supported_signals_.2F_AV_cables
 
 
-from xbox import *
+from xboxpy import *
 
 
 #FIXME: Move these libc style functions to some helper module?

python-scripts/get_timers.py

@@ -2,7 +2,7 @@
 
 # Prints information about some of the Xbox timers
 
-from xboxpy.xboxpy import *
+from xboxpy import *
 
 
 

python-scripts/inspect_apu_vp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from xbox import *
+from xboxpy import *
 
 #FIXME: Move to fields, however, globals() has another context there >.<
 def Field(offset_name, mask_name=None):

python-scripts/play_ac97.py

@@ -3,7 +3,7 @@
 # A standalone AC97 audio player, based on XAudio from OpenXDK
 # The interrupt related code has been removed as it's currently not supported.
 
-from xbox import *
+from xboxpy import *
 
 import sys
 import time

python-scripts/screenshot.py

@@ -2,7 +2,7 @@
 
 # Takes a screenshot
 
-from xbox import *
+from xboxpy import *
 
 from PIL import Image
 

python-scripts/trace_ac97.py

@@ -13,7 +13,7 @@
 seconds = 10.0
 
 
-from xbox import *
+from xboxpy import *
 
 # Open outputs
 wav = aci.export_wav("pcm_trace.wav")

python-scripts/trace_apu_mixbuf.py

@@ -20,7 +20,7 @@
 bin_index = 0
 
 
-from xbox import *
+from xboxpy import *
 
 from concurrent.futures import *