Merge pull request #63 from lurkerbot/servo_pwm_experimental

Added percentage based targetValue method for PWM servos
mteichtahl · Oct 31, 2017 · 256fc64 · 256fc64
2 parents 38dc855 + 1107b30
commit 256fc64
Show file tree

Hide file tree

Showing 16 changed files with 537 additions and 187 deletions.
diff --git a/bin/config/config.cfg b/bin/config/config.cfg
@@ -6,6 +6,8 @@ pluginDir = "./plugins"
 mappingFile = "./config/mapping.cfg"
 prepare3dConfigurationFile = "./config/prepare3d.cfg"
 pokeyConfigurationFile = "./config/pokey.cfg"
+httpListenAddress = "127.0.0.1"
+httpListenPort = 3000
 
 # AWS specific configuration
 aws = 

diff --git a/bin/config/mapping.cfg b/bin/config/mapping.cfg
@@ -193,20 +193,259 @@ mapping=(
     },
   {
     source = "G_OH_EGT",
-    target = "G_OH_EGT"
+    target = "G_OH_EGT",
+    sustain = 1000
   },
   {
     source = "G_OH_TEMPERATURE",
     target = "G_OH_TEMPERATURE",
     sustain = 1000
   },
   {
-    source = "I_OH_BATT_DISCHARGE",
-    target = "I_OH_BATT_DISCHARGE"
+    source = "V_OH_FLTALT",
+    target = "V_OH_FLTALT",
+    sustain = 1000
     },
   {
-    source = "V_OH_FLTALT",
-    target = "V_OH_FLTALT"
-    }
+    source = "B_STARTER_SOLENOID_1",
+    target = "B_STARTER_SOLENOID_1"
+  },
+  {
+    source = "B_STARTER_SOLENOID_2",
+    target = "B_STARTER_SOLENOID_2"
+  },
+  {
+    source = "S_OH_FUEL_PUMP_LA",
+    target = "S_OH_FUEL_PUMP_LA"
+  },
+  {
+    source = "S_OH_FUEL_PUMP_RA",
+    target = "S_OH_FUEL_PUMP_RA"
+  },
+    {
+    source = "S_OH_FUEL_PUMP_LF",
+    target = "S_OH_FUEL_PUMP_LF"
+  },
+  {
+    source = "S_OH_FUEL_PUMP_RF",
+    target = "S_OH_FUEL_PUMP_RF"
+  },
+  {
+    source = "S_OH_FUEL_PUMP_CL",
+    target = "S_OH_FUEL_PUMP_CL"
+  },
+  {
+    source = "S_OH_FUEL_PUMP_CR",
+    target = "S_OH_FUEL_PUMP_CR"
+  },
+  {
+    source = "S_OH_BUS_TRANSFER",
+    target = "S_OH_BUS_TRANSFER"
+  },
+  {
+    source = "S_OH_LIGHT_RWY1",
+    target = "S_OH_LIGHT_RWY1"
+  },
+  {
+    source = "S_OH_LIGHT_RWY2",
+    target = "S_OH_LIGHT_RWY2"
+  },
+  {
+    source = "S_OH_YAW_DAMPER",
+    target = "S_OH_YAW_DAMPER"
+  },
+  {
+    source = "I_OH_TEMP_PROBE",
+    target = "I_OH_TEMP_PROBE"
+  },
+  {
+    source = "I_OH_CAPT_PITOT",
+    target = "I_OH_CAPT_PITOT"
+  },
+  {
+    source = "I_OH_ELEV_PITOT1",
+    target = "I_OH_ELEV_PITOT1"
+  },
+  {
+    source = "I_OH_ELEV_PITOT2",
+    target = "I_OH_ELEV_PITOT2"
+  },
+  {
+    source = "I_OH_COWL_AI_L",
+    target = "I_OH_COWL_AI_L"
+  },
+  {
+    source = "I_OH_COWL_VALVE_L",
+    target = "I_OH_COWL_VALVE_L"
+  },
+  {
+    source = "I_OH_COWL_AI_R",
+    target = "I_OH_COWL_AI_R"
+  },
+  {
+    source = "I_OH_ALPHA_VANE1",
+    target = "I_OH_ALPHA_VANE1"
+  },
+  {
+    source = "I_OH_ENG_HYD_PUMP_R",
+    target = "I_OH_ENG_HYD_PUMP_R"
+  },
+  {
+    source = "I_OH_ALPHA_VANE2",
+    target = "I_OH_ALPHA_VANE2"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_OVT_SL",
+    target = "I_OH_WINDOW_HEAT_OVT_SL"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_FL",
+    target = "I_OH_WINDOW_HEAT_FL"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_FR",
+    target = "I_OH_WINDOW_HEAT_FR"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_SL",
+    target = "I_OH_WINDOW_HEAT_SL"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_SR",
+    target = "I_OH_WINDOW_HEAT_SR"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_OVT_FR",
+    target = "I_OH_WINDOW_HEAT_OVT_FR"
+  },
+  {
+    source = "I_OH_WINDOW_HEAT_OVT_SR",
+    target = "I_OH_WINDOW_HEAT_OVT_SR"
+  },
+  {
+    source = "I_OH_ELEC_HYD_PUMP_OVHT_1",
+    target = "I_OH_ELEC_HYD_PUMP_OVHT_1"
+  },
+  {
+    source = "I_OH_AUX_PITOT",
+    target = "I_OH_AUX_PITOT"
+  },
+  {
+    source = "I_OH_CO_PITOT",
+    target = "I_OH_CO_PITOT"
+  },
+  {
+    source = "I_OH_WAI_VALVE_L",
+    target = "I_OH_WAI_VALVE_L"
+  },
+  {
+    source = "I_OH_BLEED_TRIP_L",
+    target = "I_OH_BLEED_TRIP_L"
+  },
+  {
+    source = "I_OH_BLEED_TRIP_R",
+    target = "I_OH_BLEED_TRIP_R"
+  },
+  {
+    source = "I_OH_WINGBODY_OVT_R",
+    target = "I_OH_WINGBODY_OVT_R"
+  },
+  {
+    source = "I_OH_WINGBODY_OVT_L",
+    target = "I_OH_WINGBODY_OVT_L"
+  },
+  {
+    source = "I_OH_PRES_MANUAL",
+    target = "I_OH_PRES_MANUAL"
+  },
+  {
+    source = "I_OH_ELEC_HYD_PUMP_1",
+    target = "I_OH_ELEC_HYD_PUMP_1"
+  },
+  {
+    source = "I_OH_DOOR_FWD_SERVICE",
+    target = "I_OH_DOOR_FWD_SERVICE"
+  },
+  {
+    source = "I_OH_DOOR_LEFT_FWD_OVERWING",
+    target = "I_OH_DOOR_LEFT_FWD_OVERWING"
+  },
+  {
+    source = "I_OH_DOOR_RIGHT_FWD_OVERWING",
+    target = "I_OH_DOOR_RIGHT_FWD_OVERWING"
+  },
+  {
+    source = "I_OH_DOOR_EQUIP",
+    target = "I_OH_DOOR_EQUIP"
+  },
+  {
+    source = "I_OH_DOOR_LEFT_AFT_OVERWING",
+    target = "I_OH_DOOR_LEFT_AFT_OVERWING"
+  },
+  {
+    source = "I_OH_DOOR_FWD_ENTRY",
+    target = "I_OH_DOOR_FWD_ENTRY"
+  },
+  {
+    source = "I_OH_DOOR_AFT_ENTRY",
+    target = "I_OH_DOOR_AFT_ENTRY"
+  },
+  {
+    source = "I_OH_DOOR_RIGHT_AFT_OVERWING",
+    target = "I_OH_DOOR_RIGHT_AFT_OVERWING"
+  },
+  {
+    source = "I_OH_DOOR_AFT_CARGO",
+    target = "I_OH_DOOR_AFT_CARGO"
+  },
+  {
+    source = "I_OH_PACK_L",
+    target = "I_OH_PACK_L"
+  },
+  {
+    source = "I_OH_PRES_AUTO_FAIL",
+    target = "I_OH_PRES_AUTO_FAIL"
+  },
+  {
+    source = "I_OH_ENG_HYD_PUMP_1",
+    target = "I_OH_ENG_HYD_PUMP_1"
+  },
+  {
+    source = "I_OH_PRES_OFFSCHED",
+    target = "I_OH_PRES_OFFSCHED"
+  },
+  {
+    source = "I_OH_PACK_R",
+    target = "I_OH_PACK_R"
+  },
+  {
+    source = "I_OH_ELEC_HYD_PUMP_2",
+    target = "I_OH_ELEC_HYD_PUMP_2"
+  },
+  {
+    source = "I_OH_DOOR_FWD_CARGO",
+    target = "I_OH_DOOR_FWD_CARGO"
+  },
+  {
+    source = "I_OH_PRES_ALTN",
+    target = "I_OH_PRES_ALTN"
+  },
+  {
+    source = "B_STARTER_SOLENOID_1",
+    target = "B_STARTER_SOLENOID_1"
+  },
+  {
+    source = "B_STARTER_SOLENOID_2",
+    target = "B_STARTER_SOLENOID_2"
+  },
+  {
+    source = "S_OH_ENG_START_R",
+    target = "S_OH_ENG_START_R"
+  },
+  {
+    source = "S_OH_ENG_START_L",
+    target = "S_OH_ENG_START_L"
+  }
+
 
 )
diff --git a/bin/config/pokey.cfg b/bin/config/pokey.cfg
@@ -4,19 +4,18 @@ configuration =
   {
     serialNumber = "25770",
     name = "DCMetering",
+    # pin           - integer - any valid IO pin (1-55)
+    # name          - string  - name of the pin
+    # type          - string  - DIGITAL_INPUT, DIGITAL_OUTPUT
+    # description   - string 
+    # units         - string
+    # default       - integer - value on start
     pins = (
-      # pin           - integer - any valid IO pin (1-55)
-      # name          - string  - name of the pin
-      # type          - string  - DIGITAL_INPUT, DIGITAL_OUTPUT
-      # description   - string 
-      # units         - string
-      # default       - integer - value on start
-
     ),
+    # pins 1-2 as encoder 1
+    # pins 5-6 as encoder 2
+    # pins 15-16 as encoder 3
     encoders = (
-      # pins 1-2 as encoder 1
-      # pins 5-6 as encoder 2
-      # pins 15-16 as encoder 3
       {
         encoder = 1,
         name = "V_OH_FLTALT",
@@ -75,20 +74,21 @@ configuration =
     )
   },
   {
+    # pokey_1 
     # Fuel Control Panel & Bus Switching Panel
     serialNumber = "25774",
     name = "pokey_1",
     pins = (
     {
       pin = 1,
       name = "I_OH_FUEL_PUMP_LA",
-      description = "Left AFT fuel pump indicator"
+      description = "Left AFT fuel pump indicator",
       type = "DIGITAL_OUTPUT"
     },
     {
       pin = 2,
       name = "I_OH_FUEL_PUMP_LF",
-      description = "Left FWD fuel pump indicator"
+      description = "Left FWD fuel pump indicator",
       type = "DIGITAL_OUTPUT"
     },
     {
@@ -204,11 +204,22 @@ configuration =
       pin = 24,
       name = "I_OH_TRANS_OFF2",
       type = "DIGITAL_OUTPUT"
+    },
+    {
+      # should send GRD/OFF
+      pin = 41,
+      name = "S_OH_ENG_START_L",
+      type = "DIGITAL_INPUT"
+    }, 
+    {
+      pin = 44,
+      name = "S_OH_YAW_DAMPER",
+      type = "DIGITAL_INPUT"
     }
   )
   },
   {
-    # flight Control / AC/DC Meetering
+    # pokey_2
     serialNumber = "25423",
     name = "pokey_2",
     pins = (
@@ -295,7 +306,7 @@ configuration =
     )
   },
   {
-    serialNumber="26733",
+    serialNumber="26701",
     name = "test PWM",
     pins = (),
     pwm= (
@@ -305,7 +316,7 @@ configuration =
         decription = "APU Exhaust Gas Temp",
         units = "degrees",
         leftDutyCycle = 62000,
-        rightDutyCycle = 22000,
+        rightDutyCycle = 18000,
         period = 500000  # hw cycles
       }
     )

diff --git a/bin/config/prepare3d.cfg b/bin/config/prepare3d.cfg
@@ -1,12 +1,24 @@
 configuration = (
   {
     type="prepare3d",
-    ipAddress= "127.0.0.1",
     # ipAddress= "192.168.2.2",
+    ipAddress= "127.0.0.1",
     port = 8091,
     transforms = {
-      # S_OH_STANDBY_POWER =  { On = "Auto", Off = "Bat" },
-      # I_OH_BATT_DISCHARGE = { On = "On", Off = "Off" }
+      S_OH_STANDBY_POWER =  { On = "Auto", Off = "Bat" },
+      S_OH_FUEL_PUMP_LA = { On = "On", Off = "Off" },
+      S_OH_FUEL_PUMP_LF = { On = "On", Off = "Off" },
+      S_OH_FUEL_PUMP_RA = { On = "On", Off = "Off" },
+      S_OH_FUEL_PUMP_RF = { On = "On", Off = "Off" },
+      S_OH_FUEL_PUMP_CL = { On = "On", Off = "Off" },
+      S_OH_FUEL_PUMP_CR = { On = "On", Off = "Off" },
+      S_OH_BUS_TRANSFER = { On = "Off", Off = "Auto" },
+      S_OH_LIGHT_RWY1 = { On = "On", Off = "Off"},
+      S_OH_LIGHT_RWY2 = { On = "On", Off = "Off"},
+      S_OH_YAW_DAMPER = { On = "On", Off = "Off"},
+      S_OH_ENG_START_R = { On = "GRD", Off = "Off"},
+      S_OH_ENG_START_L = { On = "GRD", Off = "Off"}
+
     }
   }
 )