diff --git a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
index e282553037314d3623cfc3a57bba75cf95063691..09e730daea59c0ae37893bc1dc4b7978487b4c7a 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
+++ b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.ecore
@@ -12,4 +12,21 @@
   <eClassifiers xsi:type="ecore:EClass" name="SensorLaserRangeFinder" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
   <eClassifiers xsi:type="ecore:EClass" name="SensorLaserScanner" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
   <eClassifiers xsi:type="ecore:EClass" name="ActuatorPWM" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransmitter"/>
+  <eClassifiers xsi:type="ecore:EClass" name="GPI" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+  <eClassifiers xsi:type="ecore:EClass" name="GPO" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericTransmitter"/>
+  <eSubpackages name="gamepad" nsURI="http://www.fortiss.org/af3/platform/raspberry/gamepad"
+      nsPrefix="org-fortiss-af3-platform-raspberry-gamepad">
+    <eClassifiers xsi:type="ecore:EClass" name="Button1" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Button2" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Button3" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Button4" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ButtonL1" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ButtonR2" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ButtonL2" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ButtonR1" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Left_StickX_Position" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Left_StickY_Position" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Right_StickX_Position" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Right_StickY_Position" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//generic/GenericReceiver"/>
+  </eSubpackages>
 </ecore:EPackage>
diff --git a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.genmodel b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.genmodel
index 44dbaf53555f6bb631e5d96224a22ba053c95abc..7fd3a712369b555cc582e646c1cd443103e60ec4 100644
--- a/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.genmodel
+++ b/org.fortiss.af3.platform.raspberry/trunk/model/raspberry.genmodel
@@ -17,5 +17,22 @@
     <genClasses ecoreClass="raspberry.ecore#//SensorLaserRangeFinder"/>
     <genClasses ecoreClass="raspberry.ecore#//SensorLaserScanner"/>
     <genClasses ecoreClass="raspberry.ecore#//ActuatorPWM"/>
+    <genClasses ecoreClass="raspberry.ecore#//GPI"/>
+    <genClasses ecoreClass="raspberry.ecore#//GPO"/>
+    <nestedGenPackages prefix="Gamepad" basePackage="org.fortiss.af3.platform.raspberry.model"
+        disposableProviderFactory="true" ecorePackage="raspberry.ecore#//gamepad">
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Button1"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Button2"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Button3"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Button4"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/ButtonL1"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/ButtonR2"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/ButtonL2"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/ButtonR1"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Left_StickX_Position"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Left_StickY_Position"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Right_StickX_Position"/>
+      <genClasses ecoreClass="raspberry.ecore#//gamepad/Right_StickY_Position"/>
+    </nestedGenPackages>
   </genPackages>
 </genmodel:GenModel>