Skip to content

Servo pwm experimental #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lurkerbot wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Servo pwm experimental #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c25b3a7
initial
mteichtahl Aug 27, 2017
72bfe76
confusing
mteichtahl Aug 28, 2017
507a4a5
adding cfn for dynamo
mteichtahl Aug 29, 2017
69a4c8d
updating
mteichtahl Aug 30, 2017
3876942
Updated CFN Stack
mteichtahl Sep 26, 2017
4a875e5
Added experimental PWM code to this branch
mteichtahl Oct 23, 2017
188cfea
Merge branch 'servo_pwm_experimental' of github.com:mteichtahl/simhub…
martenpayne Oct 23, 2017
38dc855
WIP Commit
martenpayne Oct 24, 2017
767aab2
Added percentage based targetValue method for PWM servos
martenpayne Oct 27, 2017
2ec198a
Removed diagnostic hacked pokey access lock
martenpayne Oct 28, 2017
75f3057
Merge branch 'master' into servo_pwm_experimental
Oct 28, 2017
4d1ed2a
Added bits missing from last commit ...
Oct 28, 2017
1107b30
Tweak a few bits
Oct 28, 2017
7f1917c
Merge branch 'master' into servo_pwm_experimental
lurkerbot Nov 8, 2017
2eeada1
Fixed some merge breakage
mteichtahl Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
336 changes: 13 additions & 323 deletions bin/config/pokey.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,335 +322,25 @@ configuration =
pin = 22,
name = "I_OH_ELEC",
type = "DIGITAL_OUTPUT"
},

{
pin = 28,
name = "S_OH_LIGHT_RWY2",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 29,
name = "S_OH_LIGHT_RWY1",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 34,
name = "B_STARTER_SOLENOID_2",
type = "DIGITAL_OUTPUT"
},
{
pin = 35,
name = "B_STARTER_SOLENOID_1",
type = "DIGITAL_OUTPUT"
},
{
pin = 36,
name = "S_OH_FUEL_PUMP_CR",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 37,
name = "S_OH_FUEL_PUMP_LA",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 38,
name = "S_OH_FUEL_PUMP_CL",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 39,
name = "S_OH_FUEL_PUMP_RF",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 40,
name = "S_OH_FUEL_PUMP_RA",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 41,
name = "S_OH_FUEL_PUMP_LF",
type = "DIGITAL_INPUT",
invert = true
},
{
pin = 48,
name = "S_OH_BUS_TRANSFER",
type = "DIGITAL_INPUT",
invert = true
}

)
},
{
# pokey_3
serialNumber = "26767",
name = "pokey_3",
pins = (
{
pin = 1,
name = "I_OH_TEMP_PROBE",
type = "DIGITAL_OUTPUT"
},
{
pin = 2,
name = "I_OH_CAPT_PITOT",
type = "DIGITAL_OUTPUT"
},
{
pin = 3,
name = "I_OH_ELEV_PITOT1",
type = "DIGITAL_OUTPUT"
},
{
pin = 4,
name = "I_OH_COWL_AI_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 5,
name = "I_OH_COWL_VALVE_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 6,
name = "I_OH_COWL_AI_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 7,
name = "I_OH_WAI_VALVE_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 8,
name = "I_OH_WINDOW_HEAT_OVT_FL",
type = "DIGITAL_OUTPUT"
},
{
pin = 9,
name = "I_OH_AUX_PITOT",
type = "DIGITAL_OUTPUT"
},
{
pin = 10,
name = "I_OH_CO_PITOT",
type = "DIGITAL_OUTPUT"
},
{
pin = 11,
name = "I_OH_ALPHA_VANE1",
type = "DIGITAL_OUTPUT"
},
{
pin = 12,
name = "I_OH_ENG_HYD_PUMP_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 13,
name = "I_OH_ELEV_PITOT2",
type = "DIGITAL_OUTPUT"
},
{
pin = 14,
name = "I_OH_ALPHA_VANE2",
type = "DIGITAL_OUTPUT"
},
{
pin = 15,
name = "I_OH_WINDOW_HEAT_FR",
type = "DIGITAL_OUTPUT"
},
{
pin = 16,
name = "I_OH_WINDOW_HEAT_SR",
type = "DIGITAL_OUTPUT"
},
{
pin = 18,
name = "I_OH_WINDOW_HEAT_OVT_SL",
type = "DIGITAL_OUTPUT"
},
{
pin = 19,
name = "I_OH_WINDOW_HEAT_FL",
type = "DIGITAL_OUTPUT"
},
{
pin = 20,
name = "I_OH_WINDOW_HEAT_SL",
type = "DIGITAL_OUTPUT"
},
{
pin = 21,
name = "I_OH_WINDOW_HEAT_OVT_FR",
type = "DIGITAL_OUTPUT"
},
{
pin = 22,
name = "I_OH_ELEC_HYD_PUMP_OVHT_1",
type = "DIGITAL_OUTPUT"
},
{
pin = 23,
name = "I_OH_WINDOW_HEAT_OVT_SR",
type = "DIGITAL_OUTPUT"
},
{
pin = 24,
name = "I_OH_WAI_VALVE_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 25,
name = "I_OH_BLEED_TRIP_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 26,
name = "I_OH_BLEED_TRIP_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 27,
name = "I_OH_WINGBODY_OVT_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 28,
name = "I_OH_DOOR_AFT_SERVICE",
type = "DIGITAL_OUTPUT"
},
{
pin = 29,
name = "I_OH_WINGBODY_OVT_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 30,
name = "I_OH_PRES_MANUAL",
type = "DIGITAL_OUTPUT"
},
{
pin = 31,
name = "I_OH_ELEC_HYD_PUMP_1",
type = "DIGITAL_OUTPUT"
},
{
pin = 32,
name = "I_OH_DOOR_FWD_SERVICE",
type = "DIGITAL_OUTPUT"
},
{
pin = 33,
name = "I_OH_DOOR_LEFT_FWD_OVERWING",
type = "DIGITAL_OUTPUT"
},
{
pin = 34,
name = "I_OH_DOOR_RIGHT_FWD_OVERWING",
type = "DIGITAL_OUTPUT"
},
{
pin = 35,
name = "I_OH_DOOR_EQUIP",
type = "DIGITAL_OUTPUT"
},
{
pin = 36,
name = "I_OH_DOOR_LEFT_AFT_OVERWING",
type = "DIGITAL_OUTPUT"
},
{
pin = 37,
name = "I_OH_DOOR_FWD_ENTRY",
type = "DIGITAL_OUTPUT"
},
{
pin = 38,
name = "I_OH_DOOR_AFT_ENTRY",
type = "DIGITAL_OUTPUT"
},
{
pin = 39,
name = "I_OH_DOOR_RIGHT_AFT_OVERWING",
type = "DIGITAL_OUTPUT"
},
{
pin = 40,
name = "I_OH_DOOR_AFT_CARGO",
type = "DIGITAL_OUTPUT"
},
{
pin = 41,
name = "I_OH_PACK_L",
type = "DIGITAL_OUTPUT"
},
{
pin = 42,
name = "I_OH_PRES_AUTO_FAIL",
type = "DIGITAL_OUTPUT"
},
{
pin = 43,
name = "I_OH_ENG_HYD_PUMP_1",
type = "DIGITAL_OUTPUT"
},
{
pin = 44,
name = "I_OH_PRES_OFFSCHED",
type = "DIGITAL_OUTPUT"
},
{
pin = 45,
name = "I_OH_PACK_R",
type = "DIGITAL_OUTPUT"
},
{
pin = 46,
name = "I_OH_ELEC_HYD_PUMP_2",
type = "DIGITAL_OUTPUT"
},
{
pin = 47,
name = "I_OH_DOOR_FWD_CARGO",
type = "DIGITAL_OUTPUT"
},
{
pin = 48,
name = "I_OH_PRES_ALTN",
type = "DIGITAL_OUTPUT"
serialNumber="26701",
name = "test PWM",
pins = (),
pwm= (
{
channel = 5,
name = "G_OH_EGT",
decription = "APU Exhaust Gas Temp",
units = "degrees",
leftDutyCycle = 62000,
rightDutyCycle = 18000,
period = 500000 # hw cycles
}
)
},
{
serialNumber = "26766",
name = "PWM",
servo = (
{
channel = 1,
pin = 17,
period = 20,
name = "G_OH_EGT",
description = "Exhaust gas temp",
units = "degrees",
min = 0,
max = 710,
default = 0
}
) ,
pins = ()
}
}
)


Expand Down
11 changes: 11 additions & 0 deletions bin/config/pokey_reinvent2017.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ configuration =
name = "I_OH_PRES_MANUAL",
type = "DIGITAL_OUTPUT"
}
),
pwm= (
{
channel = 5,
name = "G_OH_OUTFLOW_VALVE",
decription = "Outflow valve position",
units = "degrees",
leftDutyCycle = 18000,
rightDutyCycle = 62000,
period = 750000 # hw cycles
}
)
}
)
Loading