Skip to content

Commit

Permalink
Pull request #25: Develop to Master
Browse files Browse the repository at this point in the history
Merge in MCU16CE/dspic33e-code-examples from develop to master

* commit '5a3c39d05a51a1977facd9d0f071a8fd757cd79d':
  Updated keyword
  Updated keyword
  Updated keyword
  Added Keywords in meta data file
  Added unapproved keyword in jenkins
  • Loading branch information
jasminefrancisca committed May 17, 2022
2 parents dca1cfb + 5a3c39d commit 306a502
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .citd/Jenkinsfilek8s
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pipeline {
DEPLOY_BRANCH_LIST = "master"
/*When using the main.json schema version 1.3.0 or higher, the PORTAL will first reject registration attempt when an unapproved keyword is found, but can be forced to accept.
This argument is used to provide the list of unapproved keywords (also listed in main.json) which the deployment script will force the PORTAL to accept.*/
UNAPPROVED_KEYWORDS_OVERRIDE_LIST="NONE"
UNAPPROVED_KEYWORDS_OVERRIDE_LIST="EXT_INTERRUPT,Trap,EDS,Extended Data Space,Open Drain,RTSP,RAM"

/*
GitHub Page Stage Information
Expand Down
1 change: 1 addition & 0 deletions dspic33e-addr-err-trap/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"peripherals":[
],
"keywords":[
"Trap"
]
}
}
1 change: 1 addition & 0 deletions dspic33e-clock-switch/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"peripherals":[
],
"keywords":[
"Clock"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-eds-auto/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"EDS",
"Extended Data Space"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-eds-manual/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"EDS",
"Extended Data Space"
]
}
}
1 change: 1 addition & 0 deletions dspic33e-ext-intr/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"EXT_INTERRUPT"
],
"keywords":[
"Interrupt"
]
}
}
1 change: 1 addition & 0 deletions dspic33e-open-drain/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"peripherals":[
],
"keywords":[
"Open Drain"
]
}
}
1 change: 1 addition & 0 deletions dspic33e-rtdm-example/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"peripherals":[
],
"keywords":[
"Communication"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-rtsp-from-aux-flash/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"Flash",
"RTSP"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-rtsp-ram/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"RTSP",
"RAM"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-rtsp-to-aux-flash/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"Flash",
"RTSP"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-rtsp-word-write/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"RTSP",
"Flash"
]
}
}
2 changes: 2 additions & 0 deletions dspic33e-stack-error-trap/.main-meta/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"peripherals":[
],
"keywords":[
"Stack",
"Trap"
]
}
}

0 comments on commit 306a502

Please sign in to comment.