bia-microddr/bia_microddr_fw
1
0
Fork 0
Code Releases 1 Activity

replaced 12mhz oscillator with 4mhz and disabled USB voltage regulator because experimental board has an external 3.3v regulator

Browse Source
This commit is contained in:
Boris Honman
2020-07-12 13:29:00 -04:00
parent 9b64d7d3cd
commit 6029ebb02d
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common_src/system.c
View File

@@ -25,17 +25,18 @@
//#include "usb.h" //#include "usb.h"
// PIC18F4550 Configuration Bit Settings
// PIC18F2550 Configuration Bit Settings
// 'C' source line config statements // 'C' source line config statements
// CONFIG1L // CONFIG1L
#pragma config PLLDIV = 3 // PLL Prescaler Selection bits (Divide by 3 (12 MHz oscillator input)) #pragma config PLLDIV = 1 // PLL Prescaler Selection bits (No prescale (4 MHz oscillator input drives PLL directly))
#pragma config CPUDIV = OSC2_PLL3// System Clock Postscaler Selection bits ([Primary Oscillator Src: /4][96 MHz PLL Src: /6]) #pragma config CPUDIV = OSC3_PLL4// System Clock Postscaler Selection bits ([Primary Oscillator Src: /3][96 MHz PLL Src: /4])
#pragma config USBDIV = 2 // USB Clock Selection bit (used in Full-Speed USB mode only; UCFG:FSEN = 1) (USB clock source comes from the 96 MHz PLL divided by 2) #pragma config USBDIV = 2 // USB Clock Selection bit (used in Full-Speed USB mode only; UCFG:FSEN = 1) (USB clock source comes from the 96 MHz PLL divided by 2)
// CONFIG1H // CONFIG1H
#pragma config FOSC = HS // Oscillator Selection bits (HS oscillator (HS)) #pragma config FOSC = HSPLL_HS // Oscillator Selection bits (HS oscillator, PLL enabled (HSPLL))
#pragma config FCMEN = OFF // Fail-Safe Clock Monitor Enable bit (Fail-Safe Clock Monitor disabled) #pragma config FCMEN = OFF // Fail-Safe Clock Monitor Enable bit (Fail-Safe Clock Monitor disabled)
#pragma config IESO = OFF // Internal/External Oscillator Switchover bit (Oscillator Switchover mode disabled) #pragma config IESO = OFF // Internal/External Oscillator Switchover bit (Oscillator Switchover mode disabled)
@@ -43,7 +44,7 @@
#pragma config PWRT = OFF // Power-up Timer Enable bit (PWRT disabled) #pragma config PWRT = OFF // Power-up Timer Enable bit (PWRT disabled)
#pragma config BOR = ON // Brown-out Reset Enable bits (Brown-out Reset enabled in hardware only (SBOREN is disabled)) #pragma config BOR = ON // Brown-out Reset Enable bits (Brown-out Reset enabled in hardware only (SBOREN is disabled))
#pragma config BORV = 3 // Brown-out Reset Voltage bits (Minimum setting 2.05V) #pragma config BORV = 3 // Brown-out Reset Voltage bits (Minimum setting 2.05V)
#pragma config VREGEN = ON // USB Voltage Regulator Enable bit (USB voltage regulator enabled) #pragma config VREGEN = OFF // USB Voltage Regulator Enable bit (USB voltage regulator disabled)
// CONFIG2H // CONFIG2H
#pragma config WDT = OFF // Watchdog Timer Enable bit (WDT disabled (control is placed on the SWDTEN bit)) #pragma config WDT = OFF // Watchdog Timer Enable bit (WDT disabled (control is placed on the SWDTEN bit))
@@ -58,9 +59,6 @@
// CONFIG4L // CONFIG4L
#pragma config STVREN = ON // Stack Full/Underflow Reset Enable bit (Stack full/underflow will cause Reset) #pragma config STVREN = ON // Stack Full/Underflow Reset Enable bit (Stack full/underflow will cause Reset)
#pragma config LVP = OFF // Single-Supply ICSP Enable bit (Single-Supply ICSP disabled) #pragma config LVP = OFF // Single-Supply ICSP Enable bit (Single-Supply ICSP disabled)
#ifdef PIC18F4550
#pragma config ICPRT = OFF // Dedicated In-Circuit Debug/Programming Port (ICPORT) Enable bit (ICPORT disabled)
#endif
#pragma config XINST = OFF // Extended Instruction Set Enable bit (Instruction set extension and Indexed Addressing mode disabled (Legacy mode)) #pragma config XINST = OFF // Extended Instruction Set Enable bit (Instruction set extension and Indexed Addressing mode disabled (Legacy mode))
// CONFIG5L // CONFIG5L
@@ -96,4 +94,6 @@
// #pragma config statements should precede project file includes. // #pragma config statements should precede project file includes.
// Use project enums instead of #define for ON and OFF. // Use project enums instead of #define for ON and OFF.
#include <xc.h> #include <xc.h>

17
firmware/bia_microddr.X/nbproject/configurations.xml
View File

@@ -78,7 +78,21 @@
<archiverTool> <archiverTool>
</archiverTool> </archiverTool>
<loading> <loading>
<loadableFile>../../bootloader/bia_microddr_bootloader.X/dist/default/production/bia_microddr_bootloader.X.production.hex</loadableFile> <makeArtifact PL="../../bootloader/bia_microddr_bootloader.X"
CT="1"
CN="default"
AC="true"
BL="true"
WD="../../bootloader/bia_microddr_bootloader.X"
BC="${MAKE} -f Makefile CONF=default"
DBC="${MAKE} -f Makefile CONF=default TYPE_IMAGE=DEBUG_RUN"
CC="rm -rf &quot;build/default&quot; &quot;dist/default&quot;"
OP="dist/default/production/bia_microddr_bootloader.X.production.hex"
DOP="dist/default/debug/bia_microddr_bootloader.X.debug.elf"
FL="dist/default/production/bia_microddr_bootloader.X.production.hex"
PD="dist/default/production/bia_microddr_bootloader.X.production.elf"
DD="dist/default/debug/bia_microddr_bootloader.X.debug.elf">
</makeArtifact>
<useAlternateLoadableFile>false</useAlternateLoadableFile> <useAlternateLoadableFile>false</useAlternateLoadableFile>
<parseOnProdLoad>false</parseOnProdLoad> <parseOnProdLoad>false</parseOnProdLoad>
<alternateLoadableFile></alternateLoadableFile> <alternateLoadableFile></alternateLoadableFile>
@@ -225,7 +239,6 @@
value="Press to browse for a specific firmware version"/> value="Press to browse for a specific firmware version"/>
<property key="ToolFirmwareOption.UseLatestFirmware" value="true"/> <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
<property key="debugoptions.useswbreakpoints" value="false"/> <property key="debugoptions.useswbreakpoints" value="false"/>
<property key="firmware.download.all" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/> <property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/> <property key="memories.aux" value="false"/>
<property key="memories.bootflash" value="true"/> <property key="memories.bootflash" value="true"/>

4
firmware/bia_microddr.X/nbproject/project.xml
View File

@@ -11,7 +11,9 @@
<header-extensions>h</header-extensions> <header-extensions>h</header-extensions>
<asminc-extensions/> <asminc-extensions/>
<sourceEncoding>ISO-8859-1</sourceEncoding> <sourceEncoding>ISO-8859-1</sourceEncoding>
<make-dep-projects/> <make-dep-projects>
<make-dep-project>../../bootloader/bia_microddr_bootloader.X</make-dep-project>
</make-dep-projects>
<sourceRootList> <sourceRootList>
<sourceRootElem>../src</sourceRootElem> <sourceRootElem>../src</sourceRootElem>
<sourceRootElem>../framework</sourceRootElem> <sourceRootElem>../framework</sourceRootElem>