Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
openMMC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
openMMC
Commits
9dc2dca1
Commit
9dc2dca1
authored
Feb 22, 2016
by
Henrique Silva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo on FMC 12v Enable pin/port label
parent
eb6698ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
payload.c
modules/payload.c
+5
-5
pin_mapping.h
port/nxp/lpc17xx/pin_mapping.h
+4
-4
No files found.
modules/payload.c
View file @
9dc2dca1
...
...
@@ -93,11 +93,11 @@ void setDC_DC_ConvertersON( bool on )
bool
_on_fmc2
=
false
|
on
;
gpio_set_pin_state
(
GPIO_EN_FMC1_PVADJ_PORT
,
GPIO_EN_FMC1_PVADJ_PIN
,
_on_fmc1
);
gpio_set_pin_state
(
GPIO_EM_FMC1_P12V_PORT
,
GPIO_EM
_FMC1_P12V_PIN
,
_on_fmc1
);
//gpio_set_pin_state( GPIO_EN_FMC1_P12V_PORT, GPIO_EN
_FMC1_P12V_PIN, _on_fmc1);
gpio_set_pin_state
(
GPIO_EN_FMC1_P3V3_PORT
,
GPIO_EN_FMC1_P3V3_PIN
,
_on_fmc1
);
gpio_set_pin_state
(
GPIO_EN_FMC2_PVADJ_PORT
,
GPIO_EN_FMC2_PVADJ_PIN
,
_on_fmc2
);
gpio_set_pin_state
(
GPIO_E
M_FMC2_P12V_PORT
,
GPIO_EM
_FMC2_P12V_PIN
,
_on_fmc2
);
gpio_set_pin_state
(
GPIO_E
N_FMC2_P12V_PORT
,
GPIO_EN
_FMC2_P12V_PIN
,
_on_fmc2
);
gpio_set_pin_state
(
GPIO_EN_FMC2_P3V3_PORT
,
GPIO_EN_FMC2_P3V3_PIN
,
_on_fmc2
);
...
...
@@ -116,9 +116,9 @@ void initializeDCDC( void )
gpio_set_pin_dir
(
GPIO_EN_FMC2_P3V3_PORT
,
GPIO_EN_FMC2_P3V3_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_EN_FMC2_PVADJ_PORT
,
GPIO_EN_FMC2_PVADJ_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_E
M_FMC2_P12V_PORT
,
GPIO_EM
_FMC2_P12V_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_E
N_FMC2_P12V_PORT
,
GPIO_EN
_FMC2_P12V_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_E
M_FMC1_P12V_PORT
,
GPIO_EM
_FMC1_P12V_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_E
N_FMC1_P12V_PORT
,
GPIO_EN
_FMC1_P12V_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_EN_FMC1_P3V3_PORT
,
GPIO_EN_FMC1_P3V3_PIN
,
OUTPUT
);
gpio_set_pin_dir
(
GPIO_EN_FMC1_PVADJ_PORT
,
GPIO_EN_FMC1_PVADJ_PIN
,
OUTPUT
);
...
...
@@ -196,7 +196,7 @@ void vTaskPayload(void *pvParmeters)
for
(
;;
)
{
/* Initialize one of the FMC's DCDC so we can measure when the Payload Power is present */
gpio_set_pin_state
(
GPIO_E
M_FMC1_P12V_PORT
,
GPIO_EM
_FMC1_P12V_PIN
,
HIGH
);
gpio_set_pin_state
(
GPIO_E
N_FMC1_P12V_PORT
,
GPIO_EN
_FMC1_P12V_PIN
,
HIGH
);
new_state
=
state
;
...
...
port/nxp/lpc17xx/pin_mapping.h
View file @
9dc2dca1
...
...
@@ -77,15 +77,15 @@
#define GPIO_EN_P1V8_PORT 0
#define GPIO_EN_P1V8_PIN 24
#define GPIO_E
M
_FMC1_P12V_PORT 0
#define GPIO_E
M
_FMC1_P12V_PIN 4
#define GPIO_E
N
_FMC1_P12V_PORT 0
#define GPIO_E
N
_FMC1_P12V_PIN 4
#define GPIO_EN_FMC1_P3V3_PORT 0
#define GPIO_EN_FMC1_P3V3_PIN 25
#define GPIO_EN_FMC1_PVADJ_PORT 1
#define GPIO_EN_FMC1_PVADJ_PIN 31
#define GPIO_E
M
_FMC2_P12V_PORT 0
#define GPIO_E
M
_FMC2_P12V_PIN 5
#define GPIO_E
N
_FMC2_P12V_PORT 0
#define GPIO_E
N
_FMC2_P12V_PIN 5
#define GPIO_EN_FMC2_P3V3_PORT 0
#define GPIO_EN_FMC2_P3V3_PIN 26
#define GPIO_EN_FMC2_PVADJ_PORT 1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment