Skip to content

Commit 4061eff

Browse files
areiter128areiter128
committed
Pull request #5: Develop
Merge in MCU16CE/dpsk3-power-buck-average-current-mode-control from develop to master * commit '11298644761da833acf4bd31a45af887690abe63': (288 commits) Update changelog for release 1.0 Updated doxygen output Updated DCLDC generated files using code generator script v3.0.7 Bugfix: sloppy if-statement resulted in disabled OCP and regulation error fault object in state ONLINE Improved fault indication using on-board LED Added function for limited fault recovery cycles OCP fault object is initialized in disabled state and will be enabled by the power controller Added LCD screen displaying currently programmed firmware version Synchronization of DPSK3 hardware description header files Updated doxygen output Updated doxygen output Set PKOB4 debugger Updated doxygen output after PRAL driver update Squashed 'dpsk_buck_acmc.X/sources/common/p33c_pral/' changes from cda33aad..34d879ea removed obsolete readme file from project Updated doxygen output Renamed temperature sensor flags and defines, separating them from uck and boost converter declarations Added conditional flags allowing to include/exclude DPSK3 board circuit sections of buck converter, boost converter and LCD driver interface Added bode measurement file to reports directory containing bundle of current loop plant measurements Added SECTIONS for conditional documentation output generation for buck converter, boost converter and LCD interface declarations to hardware description file. These flas need to be set in doxyfile under ENABLE_SECTIONS Fixed broken DOT-file path after moving doxyfile to templates diretory ...
2 parents d2e112f + 1129864 commit 4061eff

File tree

2,716 files changed

+260986
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,716 files changed

+260986
-4
lines changed

‎.citd/Jenkinsfilek8s‎

Lines changed: 235 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
1+
/*
2+
Jenkins Shared Library:
3+
----------------------
4+
shared-library-mcu16ce - https://bitbucket.microchip.com/scm/citd/shared-library-mcu16ce.git
5+
shared-library-common - https://bitbucket.microchip.com/scm/citd/shared-library-common.git
6+
*/
7+
@Library(['shared-library-mcu16ce@master', 'shared-library-common@master']) _
8+
9+
pipeline {
10+
agent {
11+
kubernetes {
12+
inheritFrom 'dpsk3-power-buck-average-current-mode-control-github-deployment'
13+
defaultContainer 'xc16-mplabx-sonar-fmpp-python'
14+
yamlFile '.citd/cloudprovider.yml'
15+
}
16+
}
17+
18+
environment {
19+
/*
20+
Common Information
21+
*/
22+
NOTIFICATION_EMAIL = '[email protected]'
23+
// GitHub production organization name
24+
GITHUB_PRODUCTION_ORGANIZATION = "microchip-pic-avr-examples"
25+
// GITHUB_PRODUCTION_ORGANIZATION = "microchip-pic-avr-solutions"
26+
27+
/*
28+
GitHub Deploy Stage Information
29+
*/
30+
//This is the BitBucket source repo URL to be deployed
31+
BITBUCKET_SOURCE_URL = 'https://bitbucket.microchip.com/scm/mcu16ce/dpsk3-power-buck-average-current-mode-control.git'
32+
//Files or folders to be excluded from deployment, if multiple files or folders use comma separator
33+
DEPLOY_EXCLUDE_FOLDER_FILE_LIST = 'mchp_private,.mchp_private,sandbox,.sandbox'
34+
//Branch(s) to be deployed, if multiple branches use comma separator. DEPLOY_BRANCH_LIST is the target branch of the PR.
35+
DEPLOY_BRANCH_LIST = "master"
36+
37+
/*
38+
GitHub Page Stage Information
39+
List of GitHub Page Options:
40+
----------------------------
41+
1. GITHUB_PAGES_NONE ( Branch: None, index file path: None )
42+
2. GITHUB_PAGES_MASTER_ROOT ( Branch: Master, index file path: /root )
43+
3. GITHUB_PAGES_MASTER_DOCS ( Branch: Master, index file path: /Docs )
44+
4. GITHUB_PAGES_DEVELOP_ROOT ( Branch: Develop, index file path: /root )
45+
5. GITHUB_PAGES_DEVELOP_DOCS ( Branch: Develop, index file path: /Docs )
46+
*/
47+
GITHUB_PAGES = 'GITHUB_PAGES_MASTER_DOCS'
48+
49+
/*
50+
Project Build Stage Information
51+
*/
52+
MPLABX_PROJECT_SOURCE = "../"
53+
}
54+
55+
options {
56+
timestamps()
57+
timeout(time: 20, unit: 'MINUTES')
58+
}
59+
60+
stages {
61+
stage('Checkout') {
62+
steps {
63+
checkout scm
64+
}
65+
}
66+
67+
stage('project config update') {
68+
steps {
69+
script {
70+
mplabxProjectConfigUpdate(
71+
sourceFilePath: "${env.MPLABX_PROJECT_SOURCE}"
72+
)
73+
}
74+
}
75+
}
76+
77+
stage('Build') {
78+
steps {
79+
script {
80+
mplabxProjectBuild(
81+
sourceFilePath: "${env.MPLABX_PROJECT_SOURCE}"
82+
)
83+
}
84+
}
85+
}
86+
87+
// Validate main.json file
88+
stage('Validate main.json'){
89+
steps{
90+
script{
91+
validateMetaData()
92+
}
93+
}
94+
}
95+
96+
// Creating tag in Bitbucket repo
97+
stage('Bitbucket Tag Creation') {
98+
when {
99+
anyOf {
100+
allOf {
101+
not { changeRequest() }
102+
anyOf {branch 'master';}
103+
}
104+
}
105+
}
106+
107+
steps{
108+
script{
109+
bitbucketTagCreation()
110+
}
111+
}
112+
}
113+
114+
// GitHub repo creation
115+
stage('GitHub Repo Creation'){
116+
when {
117+
anyOf {
118+
allOf {
119+
not { changeRequest() }
120+
}
121+
}
122+
}
123+
124+
steps{
125+
script{
126+
githubRepoCreate(
127+
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}",
128+
deployBranchList: "${DEPLOY_BRANCH_LIST}"
129+
)
130+
}
131+
}
132+
}
133+
134+
// Deploying the code to GitHub
135+
stage('GitHub Deploy Source'){
136+
when {
137+
anyOf {
138+
allOf {
139+
not { changeRequest() }
140+
}
141+
}
142+
}
143+
144+
steps{
145+
script{
146+
githubDeploySource(
147+
bitbucketUrl: "${env.BITBUCKET_SOURCE_URL}",
148+
deployBranchList: "${env.DEPLOY_BRANCH_LIST}",
149+
deployExcludeFileList: "${env.DEPLOY_EXCLUDE_FOLDER_FILE_LIST}",
150+
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}"
151+
)
152+
}
153+
}
154+
}
155+
156+
// Creating GitHub release
157+
stage('GitHub release'){
158+
when {
159+
anyOf {
160+
allOf {
161+
not { changeRequest() }
162+
}
163+
}
164+
}
165+
166+
steps{
167+
script{
168+
githubReleaseCreate(
169+
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}",
170+
deployBranchList: "${DEPLOY_BRANCH_LIST}"
171+
)
172+
}
173+
}
174+
}
175+
176+
// Creating GitHub Page
177+
stage('GitHub Page Create'){
178+
when {
179+
anyOf {
180+
allOf {
181+
not { changeRequest() }
182+
anyOf {branch 'master';}
183+
}
184+
}
185+
}
186+
187+
steps{
188+
script{
189+
githubPageCreate(
190+
githubPage: "${env.GITHUB_PAGES}",
191+
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}"
192+
)
193+
}
194+
}
195+
}
196+
197+
//Deploying the Github content to portal
198+
stage('Portal-Deploy') {
199+
when {
200+
allOf {
201+
not { changeRequest() }
202+
anyOf {branch 'master';}
203+
}
204+
}
205+
steps {
206+
script {
207+
portalDeploy(
208+
githubOrgName: "${env.GITHUB_PRODUCTION_ORGANIZATION}"
209+
)
210+
}
211+
}
212+
}
213+
}
214+
215+
post {
216+
success{
217+
script {
218+
sendMail(
219+
mailId: "${env.NOTIFICATION_EMAIL}",
220+
subject: "Successful Pipeline: ${currentBuild.fullDisplayName}",
221+
body: "Something is right with ${env.BUILD_URL}"
222+
)
223+
}
224+
}
225+
failure {
226+
script {
227+
sendMail(
228+
mailId: "${env.NOTIFICATION_EMAIL}",
229+
subject: "Failure Pipeline: ${currentBuild.fullDisplayName}",
230+
body: "Something is right with ${env.BUILD_URL}"
231+
)
232+
}
233+
}
234+
}
235+
}

‎.citd/cloudprovider.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: v1
2+
kind: Pod
3+
metadata:
4+
name: xc16-mplabx-sonar-fmpp-python
5+
spec:
6+
containers:
7+
- name: xc16-mplabx-sonar-fmpp-python
8+
image: artifacts.microchip.com:7999/microchip/citd/bundles/xc16-mplabx-sonar-fmpp-python-yarn-node:latest
9+
imagePullPolicy: Always
10+
command: ['cat']
11+
tty: true
12+
resources:
13+
requests:
14+
cpu: 1
15+
memory: 1Gi
16+
limits:
17+
cpu: 2
18+
memory: 2Gi

‎.gitignore‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# .gitignore file
2+
#
3+
# Set up for Microchip/MPLAB X® development
4+
#
5+
# Default gitignore files for code examples, only removing/ignoring usual MPLAB X® clutter
6+
7+
# Excluding object files
8+
*.o
9+
*.ko
10+
*.obj
11+
*.elf
12+
13+
# Excluding documentation output directories
14+
#docs/
15+
16+
# Excluding any executables
17+
*.exe
18+
19+
#Excluding Files/Folders Auto-Generated by Test Harness
20+
.generated_files/
21+
22+
# Excluding Netbeans specific build directories and file types
23+
~*.*
24+
.generated_files/
25+
nbproject/build/
26+
nbproject/dist/
27+
nbproject/private/
28+
nbproject/disassembly/
29+
build/
30+
dist/
31+
private/
32+
disassembly/
33+
*.zip
34+
!code-templates.zip
35+
*.mk
36+
*.bash
37+
*.dump
38+
Makefile-genesis.properties
39+
40+
# Excluding MPLAB X® Trace files
41+
*.log
42+
*.inx
43+
44+
# KDE specific
45+
.directory
46+
47+
# Misc
48+
.svn
49+
*.bak
50+
*.doc
51+
*.docx
52+
53+
54+

‎.main-meta/main.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"metaDataVersion":"1.0.0",
3+
"category":"com.microchip.ide.project",
4+
"content":{
5+
"metaDataVersion":"1.0.0",
6+
"name":"com.microchip.mplabx.project.dpsk3-power-buck-average-current-mode-control",
7+
"version":"1.0.0",
8+
"displayName":"DPSK3 Synchronous Buck Converter Average Current Mode Control",
9+
"projectName":"dpsk3-power-buck-average-current-mode-control",
10+
"shortDescription":"Digital control loop implementation of a dual-loop average current mode controller regulating the output voltage of a synchronous buck converter",
11+
"ide":{
12+
"name":"MPLABX",
13+
"semverRange":">=5.40.0"
14+
},
15+
"compiler":{
16+
"name":"XC16",
17+
"semverRange":"^1.50.0"
18+
},
19+
"dfp":{
20+
"name":"dsPIC33CK-MP_DFP",
21+
"semverRange":">=1.4.102"
22+
},
23+
"configurator": {
24+
"name": "MCC",
25+
"semverRange": ">=4.0.1"
26+
},
27+
"device":{
28+
"metaDataVersion":"1.0.0",
29+
"category":"com.microchip.portal.contentRef",
30+
"content":{
31+
"metaDataVersion":"1.0.0",
32+
"category":"com.microchip.device",
33+
"name":"dsPIC33CK256MP505",
34+
"versionRange":"*"
35+
}
36+
},
37+
"peripherals":[
38+
"UART",
39+
"PWM",
40+
"SMPS PWM",
41+
"ADC",
42+
"TIMER",
43+
"SPI",
44+
"LCD"
45+
],
46+
"subcategories": [
47+
"Power",
48+
"Power Management and Conversion"
49+
],
50+
"keywords": [
51+
"dsPIC",
52+
"DSC",
53+
"Digital Power Conversion",
54+
"Digital Filters",
55+
"Power Conversion",
56+
"Power Supply",
57+
"SMPS"
58+
]
59+
}
60+
}

0 commit comments

Comments
 (0)