Added ThreeBeeBee build configuration to bootloader project.

2020-05-10 15:00:29 -05:00 · 2020-05-10 15:00:29 -05:00 · 4bb74eb4a6
commit 4bb74eb4a6
--- a/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.cof
+++ b/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.cof
--- a/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.hex
+++ b/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.hex
@ -0,0 +1,257 @@
+:020000040000FA
+:0600000076EF06F012008D
+:0600080004EF08F01200F5
+:060018000CEF08F01200DD
+:02001E001DEED5
+:0E00200000F02DEE00F0F86A92EF06F01200EC
+:020030000000CE
+:0E0032003E0E006E016AFC0E026E036A046A46
+:10004000076808680968066A1200D9CFE6FFE1CFA1
+:10005000D9FFE65204501EE1040108BF1AD0400E39
+:10006000E66E600EE66E000EE66E38EC06F0E552C7
+:10007000E552E552010E046EDF6A400EDF5C09E2D4
+:10008000DF50EA6AA00FE96E000EEA22EF6ADF2A6B
+:10009000F4D717D100016051080A01E10DD10F0A10
+:1000A00001E1D3D0010A01E1CAD0030A67E0010AE5
+:1000B00058E0070A44E0010A01E003D10001020E02
+:1000C000A06F00013A0EA16F0001010EA26F0001A6
+:1000D000010EA36F0001A46B100EA56FA66BA76B9A
+:1000E00001C0A8F002C0A9F003C0AAF0100E0001E0
+:1000F000A95F000E0001AA5B0001AB6B0001030EBB
+:10010000AC6F0001F80EAD6FAE69AF6BB06B000164
+:10011000080EB16FB26BB36BB46B0001B56904012B
+:100120000CBF0CD0400EE66EA00EE66E000EE66E22
+:1001300008EC06F0E552E552E552046AC2D000012F
+:10014000615107E13F0E006EF80E016E0268036A0E
+:1001500006D03E0E006E016AFC0E026E036A046A4F
+:10016000B0D0040E056E0028055C06E20400AED88F
+:100170009DEC04F0052AF7D7046AA3D0E8680718B5
+:1001800005E1E868081802E1E868091806E161C0BD
+:1001900007F062C008F063C009F007500001611960
+:1001A00008E108500001621904E1095000016319D7
+:1001B00000E143E1DF6A00016551DF5C3EE2000ED1
+:1001C000075C100E0858000E09582CE300285B6EDF
+:1001D0005C6A0A0ED8905B365C36E806FBE15D6A25
+:1001E0005CBE5D685B50075C5C5008585D50095808
+:1001F00019E23A0E0001D8806555DF24EA6A660FDD
+:10020000E96E000EEA22EF50E66E0650E96EEA6AE9
+:10021000E9BEEA680A0EE926000EEA22E552E75036
+:10022000EF6E062A072A000E0822000E09223A0E57
+:10023000065C01E15ED8DF2ABED7046A42D059D8F5
+:10024000076808680968046A3CD00001070EA06FBF
+:1002500061C0A1F062C0A2F063C0A3F064C0A4F0CA
+:1002600065C0A5F061C0F6FF62C0F7FF63C0F8FF8C
+:10027000DF6A00016551DF5C0FE209003A0E000100
+:10028000D8806555DF24EA6AA60FE96E000EEA22DF
+:10029000F5CFEFFFDF2AEDD704010CBF0CD0400EE5
+:1002A000E66EA00EE66E000EE66E08EC06F0E55275
+:1002B000E552E552046A05D06592656A68D8FF0088
+:1002C00000D0E552E552E7CFD9FF1200F66A05509B
+:1002D000F76EF86AD890F736F836F736F836140E17
+:1002E000A66EF29E550EA76EAA0EA76EA682A694C3
+:1002F0001200D9CFE6FFE1CFD9FFE652DF6A000E48
+:10030000E76E0618E8AE02D0063403D0E750D88076
+:10031000065436E206505B6E5C6A5D6A5BAE02D0E4
+:100320005C685D685B50075CF66E5C500858F76E61
+:100330005D500958F86EDF50EA6A0A0FE96E000E48
+:10034000EA22EF50F56E0D00DF2A0606065009E09E
+:10035000DF50EA6A0A0FE96E000EEA22EF50F56EEE
+:1003600001D0F5680C00DF2A240EA66EF29E550E11
+:10037000A76EAA0EA76EA682065001E00606BFD79A
+:10038000A694066AE552E552E7CFD9FF1200D9CF0D
+:10039000E6FFE1CFD9FFE652DF6AFF0EDF5C0AE23B
+:1003A000E868E85005E0E80600D000D000D0F9D7B2
+:0E03B000DF2AF3D7E552E552E7CFD9FF12005E
+:0203BE005FD905
+:1003C000E652645032E16296040100513C0BE8426F
+:1003D000E8420D0828E1180E021923E1040E031962
+:1003E00020E1100E026F040E036FDF6ADF505B6EB8
+:1003F0005C6A080E5B5C000E5C5813E2DF50EA6A30
+:10040000180FE96E040EEA22EF50E66EDF50EA6A3A
+:10041000100FE96E040EEA22E552E750EF6EDF2A74
+:10042000E5D70ED80AD03DD808D0040E645C03E1AD
+:1004300062964DD802D0000E01D0010EE55224D1B3
+:100440001ED9E652040104BF046B556A516A526A10
+:10045000536A546A4FEC03F0DF6ADF505B6E5C6AEC
+:10046000010E5B5C000E5C5819E2525017E1F76A0E
+:10047000DF34FE0BF736F66EA40EF6260E0EF722CC
+:100480000900F5CF5BF00800F5CF5CF004D05CC04C
+:10049000FAFF5B50F96EFBDFDF2ADFD79ED8E5520B
+:1004A000F3D0020E515C0EE176D80401180E026FF3
+:1004B000040E036F080E016F00BD02D0C80E05D0F8
+:1004C000880E03D0BCD8CCD88C0E006F1200040E5E
+:1004D000575C0AE112C438FF0F013851000802E2EC
+:1004E000050E01D0030E576E51040FE110D8020E15
+:1004F000555C03E10401840E06D0040104BD02D062
+:10050000C80E01D0880E046F12001FEF03F0B7D899
+:10051000020EE126080E535C000E54580DE253C043
+:10052000DEFF54C0DDFF555002E1010E03D055043B
+:1005300006E1020E556E03D0080EDE6EDD6A040180
+:1005400004930491010EDB500413DFCF05F4DE5059
+:10055000535EDD50545A0001180EE26F040EE36F33
+:1005600058A20CD085D810E0E0C0F6FFE1C0F7FF3C
+:100570000800F55068D8F6E2DB06F4D779D804E035
+:1005800087D8FCE2DB06FAD7020EE15C02E2E16A00
+:10059000E552E16E79D073D8020EE126030E040114
+:1005A0000015E76E010EE7CFDBFF01C4DFFFDE5071
+:1005B0005326DD5054220001180EE06F040EE16F47
+:1005C00057D804E065D8FCE2DB06FAD7020EE15CFE
+:1005D00002E2E16AE552E16E57D06598525005E1BA
+:1005E0003FD8840E006F040118D0040110AF17D05B
+:1005F0005350165D5450175904E216C453F017C4F3
+:1006000054F085DF010E516E2BD8800E006F04016F
+:10061000180E066F040E076FC80E046F1200020E4C
+:10062000516E0401056BC80E046F0401080E016FC2
+:10063000180E026F040E036FC80E006F1200516A8D
+:100640000401046B1200E2C0E9FFE3C0EAFFEF6EB1
+:10065000E22B000EE323E02BE123DF06010E120064
+:100660000401080E016F100E026F040E036F1200DA
+:10067000D9CFE9FFDACFEAFFEE50ED101200D9CF63
+:10068000E6FFE1CFD9FF1200E552E7CFD9FF120014
+:0E069000E0C0E9FFE1C0EAFFEF5023EF03F006
+:02069E00040155
+:1006A0001051600BE842E842E842E842E8420009A3
+:1006B00001E012001151070A43E00B0A41E0070A6A
+:1006C00034E0010A24E00B0A20E0020A1EE0030ADB
+:1006D0001AE0080A10E0010A0CE00F0A08E0030A19
+:1006E00001E01200010E526E040E576E1200A1EFCF
+:1006F00003F0D7EF03F0010E526E0001590EE06FC8
+:10070000000EE16F0ED0F1EF03F01FEF04F0010EC9
+:10071000526E14510001E06FE16B5A0EE027000E9B
+:10072000E1235892010E536E1200010E526E1451C5
+:10073000EA6A5A0FE96E000EEA2212C4EFFF1200B5
+:100740001200800E0401105D31E11351030A20E014
+:10075000010A0BE0030A29E1010E526E0001E40ECA
+:10076000E06F0D0EE16F120E1ED0AAD89A0EF6267B
+:100770000E0EB8D8020E0001F76AE025F66EE151C0
+:10078000F7220900F5CF53F00A00F5CF54F00DD051
+:1007900097D89E0EF6260E0EA5D8E0C0F6FFE1C053
+:1007A000F7FF0800F550536E546A58821200010E8C
+:1007B000526E0F0EE66E270EE66E0F0E9BD8010EE0
+:1007C000E66E5A0EE66E000E95D812C459F004017A
+:1007D000125103E1050E576E1200060E576EF3EF2D
+:1007E00005F00401186B196B040110511F0B020A6C
+:1007F0000EE0030A09E0010A17E1010E526E58A04B
+:1008000013D00401188310D0010E526E0DD04AD8B7
+:1008100001E0010E5ED8E2C0E9FFEA6EEF50040B82
+:1008200003E00401010E186F520408E10001180EE4
+:10083000E06F040EE16F5892020E536E1200040135
+:1008400012050CE110511F0B000908E1010E526E58
+:10085000030E115D02E1588001D05890125121E140
+:1008600010511F0B02081DE114510F0B000919E074
+:1008700019D801E0010E2DD8030E0401115D02E12B
+:10088000840E03D014AF07D0400EE2C0E9FFE3C0EE
+:10089000EAFFEF6E1200880EE2C0E9FFE3C0EAFF54
+:1008A000EF6E1200010E526E14510F0B080DF35033
+:1008B0005C6A000F5B6E040E5C221451800B120008
+:1008C000010E526E1251F66EF76AD890F636F73670
+:1008D0001200040DF35000015B24E26F000E5C2057
+:1008E000E36F1200F7220900F5CFE0F00A00F5CF20
+:1008F000E1F01200E66E76EC05F0E552E552E552C5
+:020900001200E3
+:0E09020065A60CD8570409E165BA07D0626AF1
+:100910000F01366B36813689020E576E1200656AFA
+:100920000F01366B6586010E576E1200656A0F0166
+:10093000366B576A120096EF04F0575001E112002F
+:100940006250040B05E00F013651040B01E083D81F
+:1009500065B212006250010B05E00F013651010B28
+:1009600001E093D86250100B05E00F013651100BD7
+:1009700001E01FD86250200B05E00F013651200B1B
+:1009800001E071D8030E575C01E21200566A040EB2
+:10099000565C0EE26250080B0BE00F013651080B5B
+:1009A00007E0DFEC01F0000901E16296562AEFD77B
+:1009B0001200D9CFE6FFE1CFD9FF020EE12636CFF4
+:1009C000DFFF0F01040E366F629865828C50040BB6
+:1009D00001E0010E5B6E8C50080B01E0010E5B1014
+:1009E000E76E010EE7CFDBFF8C968C94A198A08870
+:1009F0000300A150100B05E1D050080B02E10300E9
+:100A0000F8D7A098DF500F013613010EDB50E8B085
+:100A10008C86E8A08C96010EDB50E8B08C84E8A0B0
+:100A20008C94D50E4F6E020E506E4FC05BF050C0CE
+:100A30005CF04F06000E505A5B505C1002E0040060
+:100A4000F4D7020EE15C02E2E16AE552E16EE552A2
+:100A5000E7CFD9FF120065920F01369562A402D04C
+:100A60006294FCD712000F0126A10DD0800E040164
+:100A7000005D07E1840E0401045D03E104018C0EB6
+:100A8000006F0F012691629A1200636A626A0F0179
+:100A90009F0E376F0F017B0E366F0F01386B0F0EF5
+:100AA000E66E270EE66E0F0EE66E20D8E552E55292
+:100AB000E5520F01160E266F62A605D0629600D091
+:100AC00000D00000F9D765981FEC03F00401080E70
+:100AD000016F0401100E026F040E036F04018C0EEF
+:100AE000006F5890596A030E576E1200D9CFE6FF77
+:100AF000E1CFD9FFFD0EDBCFE9FFFE0EDBCFEAFF32
+:100B0000FC0EDB5004E0EE6AFC0EDB06F9D7E55282
+:060B1000E7CFD9FF12003F
+:0A0B1600040110511F0B010801E05B
+:100B20001200145101E01200060E115D21E1135173
+:100B3000230A1DE0010A0DE0030A19E1020E526EBC
+:100B4000590405E10001080EE06F0E0EE16F090E79
+:100B50000CD0020E526E590405E100017D0EE06FCB
+:100B60000E0EE16F590403E11D0E536E546A588254
+:100B700004011051600BE842E842E842E842E842D2
+:100B8000010801E0120011510B0A26E0080A19E0E1
+:100B9000090A12E0080A09E00B0A05E0080A01E068
+:100BA0001200F1EF05F0F2EF05F0020E526E0001B7
+:100BB0004A0EE06F000E0BD0020E526E13C44AF0C4
+:100BC0001200020E526E00014B0EE06F000EE16F3C
+:100BD0005892010E536E1200020E526E12C44BF068
+:100BE0001200120012004C6A0F011E0E276F040142
+:100BF000400E096F200E0A6F040E0B6F880E086FEF
+:100C00000401600E0E6F040E0F6F400E0C6F120089
+:100C1000D9CFE6FFE1CFD9FFE652FC0EDB5040080A
+:100C200005E2400EF36EFC0EF3CFDBFFDF6AFC0E35
+:100C3000DB50DF5C0FE2DF504DD8EF50E66EDF5047
+:100C4000EA6A600FE96E040EEA22E552E750EF6EA1
+:100C5000DF2AEDD7FC0EDBCF0DF4400E04010C179C
+:100C60000C7D880E0C13E552E552E7CFD9FF120038
+:100C7000D9CFE6FFE1CFD9FF4C6A040108BF25D0E8
+:100C8000FC0EDBCF5BF00951D8805B5403E2FC0E15
+:100C900009C4DBFF4C6AFC0EDB504C5C0FE24C508D
+:100CA000EA6A200FE96E040EEA22EF50E66E4C501D
+:100CB00011D8E552E750EF6E4C2AEDD70401400EF3
+:100CC000096F0817087D880E08134C50E552E7CFCE
+:100CD000D9FF1200E76EFD0EDBCFE9FFFE0EDBCF82
+:0C0CE000EAFFE750E926000EEA221200AD
+:040CEC001DEE00F009
+:100CF0002DEE00F0F86AF66A100EF76E0800F55057
+:100D0000FF0808E1010EF66E100EF76E0800F550B0
+:100D1000FF0806E080AC02D000EF08F080ACFED700
+:100D200001D812000DD8040034D837D8060E575C0D
+:100D300005E16550020B02E125EC00F0F4D712004A
+:100D4000600ED36E9B8C580E4F6E020E506E4FC0CD
+:100D50005BF050C05CF04F06000E505A5B505C10C8
+:100D6000F6E165A604D06592656AC7EC01F00F0153
+:100D7000140E396F576A586A596A19EC00F04D6AB7
+:100D80004E6A8C968C94959695940F01486B496B9E
+:100D9000120081EC04F09DEF04F04D504E1004E180
+:100DA000100E4D6E270E4E6E4D06000E4E5A060E5C
+:100DB000575C02E28C868C94060E575C12E14D5013
+:100DC0004E100FE10001E65102E18C868C94030E77
+:100DD000E65D02E18C968C84E62BE651030801E285
+:040DE000E66B1200AC
+:0C0DE4001201000200000008D8043C00CE
+:100DF00002000102000109022900010100C03209BC
+:100E00000400000203000000092111010001221D5D
+:100E100000070581034000010705010340000104AC
+:100E200003090434034D006900630072006F00631E
+:100E300000680069007000200054006500630068CD
+:100E4000006E006F006C006F0067007900200049A1
+:100E5000006E0063002E0026034800490044002075
+:100E600000550053004200200042006F006F0074E4
+:100E7000006C006F0061006400650072000600FFF6
+:100E80000901A10119012940150026FF00750895E7
+:100E9000408100190129409100C0F60DF60D1F0E8A
+:060EA000230E570E160B95
+:0A0EA600C00EF36E00EE00F00E0E19
+:100EB00001D81200EA6002D0EE6AFCD7F350E96074
+:060EC0001200EE6AFCD7EF
+:01FFF800AC5C
+:01FFF900F710
+:01FFFA000AFC
+:01FFFB00FF06
+:01FFFC0063A1
+:01FFFD00F80B
+:01FFFE000101
+:01FFFF00F011
+:00000001FF
--- a/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.map
+++ b/EBB_firmware/bootloader.X/dist/THREEBEEBEE/production/bootloader.X.production.map
--- a/EBB_firmware/bootloader.X/nbproject/Makefile-THREEBEEBEE.mk
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-THREEBEEBEE.mk
@ -0,0 +1,267 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Include project Makefile
+ifeq "${IGNORE_LOCAL}" "TRUE"
+# do not include local makefile. User is passing all local related variables already
+else
+include Makefile
+# Include makefile containing local settings
+ifeq "$(wildcard nbproject/Makefile-local-THREEBEEBEE.mk)" "nbproject/Makefile-local-THREEBEEBEE.mk"
+include nbproject/Makefile-local-THREEBEEBEE.mk
+endif
+endif
+
+# Environment
+MKDIR=gnumkdir -p
+RM=rm -f 
+MV=mv 
+CP=cp 
+
+# Macros
+CND_CONF=THREEBEEBEE
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+IMAGE_TYPE=debug
+OUTPUT_SUFFIX=cof
+DEBUGGABLE_SUFFIX=cof
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+else
+IMAGE_TYPE=production
+OUTPUT_SUFFIX=hex
+DEBUGGABLE_SUFFIX=cof
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+endif
+
+ifeq ($(COMPARE_BUILD), true)
+COMPARISON_BUILD=
+else
+COMPARISON_BUILD=
+endif
+
+ifdef SUB_IMAGE_ADDRESS
+
+else
+SUB_IMAGE_ADDRESS_COMMAND=
+endif
+
+# Object Directory
+OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
+
+# Distribution Directory
+DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
+
+# Source Files Quoted if spaced
+SOURCEFILES_QUOTED_IF_SPACED=source/Boot46J50Family.c source/hid.c source/main.c source/usb9.c source/usbctrltrf.c source/usbdrv.c source/usbdsc.c source/usbmmap.c
+
+# Object Files Quoted if spaced
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/source/Boot46J50Family.o ${OBJECTDIR}/source/hid.o ${OBJECTDIR}/source/main.o ${OBJECTDIR}/source/usb9.o ${OBJECTDIR}/source/usbctrltrf.o ${OBJECTDIR}/source/usbdrv.o ${OBJECTDIR}/source/usbdsc.o ${OBJECTDIR}/source/usbmmap.o
+POSSIBLE_DEPFILES=${OBJECTDIR}/source/Boot46J50Family.o.d ${OBJECTDIR}/source/hid.o.d ${OBJECTDIR}/source/main.o.d ${OBJECTDIR}/source/usb9.o.d ${OBJECTDIR}/source/usbctrltrf.o.d ${OBJECTDIR}/source/usbdrv.o.d ${OBJECTDIR}/source/usbdsc.o.d ${OBJECTDIR}/source/usbmmap.o.d
+
+# Object Files
+OBJECTFILES=${OBJECTDIR}/source/Boot46J50Family.o ${OBJECTDIR}/source/hid.o ${OBJECTDIR}/source/main.o ${OBJECTDIR}/source/usb9.o ${OBJECTDIR}/source/usbctrltrf.o ${OBJECTDIR}/source/usbdrv.o ${OBJECTDIR}/source/usbdsc.o ${OBJECTDIR}/source/usbmmap.o
+
+# Source Files
+SOURCEFILES=source/Boot46J50Family.c source/hid.c source/main.c source/usb9.c source/usbctrltrf.c source/usbdrv.c source/usbdsc.c source/usbmmap.c
+
+
+
+CFLAGS=
+ASFLAGS=
+LDLIBSOPTIONS=
+
+############# Tool locations ##########################################
+# If you copy a project from one host to another, the path where the  #
+# compiler is installed may be different.                             #
+# If you open this project with MPLAB X in the new host, this         #
+# makefile will be regenerated and the paths will be corrected.       #
+#######################################################################
+# fixDeps replaces a bunch of sed/cat/printf statements that slow down the build
+FIXDEPS=fixDeps
+
+.build-conf:  ${BUILD_SUBPROJECTS}
+ifneq ($(INFORMATION_MESSAGE), )
+	@echo $(INFORMATION_MESSAGE)
+endif
+	${MAKE}  -f nbproject/Makefile-THREEBEEBEE.mk dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+
+MP_PROCESSOR_OPTION=18F46J50
+MP_PROCESSOR_OPTION_LD=18f46j50
+MP_LINKER_DEBUG_OPTION=  -u_DEBUGSTACK
+# ------------------------------------------------------------------------------------
+# Rules for buildStep: assemble
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+else
+endif
+
+# ------------------------------------------------------------------------------------
+# Rules for buildStep: compile
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+${OBJECTDIR}/source/Boot46J50Family.o: source/Boot46J50Family.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/Boot46J50Family.o.d 
+	@${RM} ${OBJECTDIR}/source/Boot46J50Family.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/Boot46J50Family.o   source/Boot46J50Family.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/Boot46J50Family.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/Boot46J50Family.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/hid.o: source/hid.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/hid.o.d 
+	@${RM} ${OBJECTDIR}/source/hid.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/hid.o   source/hid.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/hid.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/hid.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/main.o: source/main.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/main.o.d 
+	@${RM} ${OBJECTDIR}/source/main.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/main.o   source/main.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/main.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usb9.o: source/usb9.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usb9.o.d 
+	@${RM} ${OBJECTDIR}/source/usb9.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usb9.o   source/usb9.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usb9.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usb9.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbctrltrf.o: source/usbctrltrf.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbctrltrf.o.d 
+	@${RM} ${OBJECTDIR}/source/usbctrltrf.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbctrltrf.o   source/usbctrltrf.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbctrltrf.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbctrltrf.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbdrv.o: source/usbdrv.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbdrv.o.d 
+	@${RM} ${OBJECTDIR}/source/usbdrv.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbdrv.o   source/usbdrv.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbdrv.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbdrv.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbdsc.o: source/usbdsc.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbdsc.o.d 
+	@${RM} ${OBJECTDIR}/source/usbdsc.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbdsc.o   source/usbdsc.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbdsc.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbdsc.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbmmap.o: source/usbmmap.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbmmap.o.d 
+	@${RM} ${OBJECTDIR}/source/usbmmap.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbmmap.o   source/usbmmap.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbmmap.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbmmap.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+else
+${OBJECTDIR}/source/Boot46J50Family.o: source/Boot46J50Family.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/Boot46J50Family.o.d 
+	@${RM} ${OBJECTDIR}/source/Boot46J50Family.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/Boot46J50Family.o   source/Boot46J50Family.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/Boot46J50Family.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/Boot46J50Family.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/hid.o: source/hid.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/hid.o.d 
+	@${RM} ${OBJECTDIR}/source/hid.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/hid.o   source/hid.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/hid.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/hid.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/main.o: source/main.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/main.o.d 
+	@${RM} ${OBJECTDIR}/source/main.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/main.o   source/main.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/main.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usb9.o: source/usb9.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usb9.o.d 
+	@${RM} ${OBJECTDIR}/source/usb9.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usb9.o   source/usb9.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usb9.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usb9.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbctrltrf.o: source/usbctrltrf.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbctrltrf.o.d 
+	@${RM} ${OBJECTDIR}/source/usbctrltrf.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbctrltrf.o   source/usbctrltrf.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbctrltrf.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbctrltrf.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbdrv.o: source/usbdrv.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbdrv.o.d 
+	@${RM} ${OBJECTDIR}/source/usbdrv.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbdrv.o   source/usbdrv.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbdrv.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbdrv.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbdsc.o: source/usbdsc.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbdsc.o.d 
+	@${RM} ${OBJECTDIR}/source/usbdsc.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbdsc.o   source/usbdsc.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbdsc.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbdsc.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+${OBJECTDIR}/source/usbmmap.o: source/usbmmap.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} "${OBJECTDIR}/source" 
+	@${RM} ${OBJECTDIR}/source/usbmmap.o.d 
+	@${RM} ${OBJECTDIR}/source/usbmmap.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE) -p$(MP_PROCESSOR_OPTION) -DTHREEBEEBEE_V10 -I"." -ms -oa-  -I ${MP_CC_DIR}\\..\\h  -fo ${OBJECTDIR}/source/usbmmap.o   source/usbmmap.c 
+	@${DEP_GEN} -d ${OBJECTDIR}/source/usbmmap.o 
+	@${FIXDEPS} "${OBJECTDIR}/source/usbmmap.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c18 
+	
+endif
+
+# ------------------------------------------------------------------------------------
+# Rules for buildStep: link
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk    source/BootModified.rm18f46j50_g.lkr
+	@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
+	${MP_LD} $(MP_EXTRA_LD_PRE) "source\BootModified.rm18f46j50_g.lkr"  -p$(MP_PROCESSOR_OPTION_LD)  -w -x -u_DEBUG -m"${DISTDIR}/bootloader.X.${IMAGE_TYPE}.map"  -z__MPLAB_BUILD=1  -u_CRUNTIME -z__MPLAB_DEBUG=1 -z__MPLAB_DEBUGGER_PK3=1 $(MP_LINKER_DEBUG_OPTION) -l ${MP_CC_DIR}\\..\\lib  -o dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}   
+else
+dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk   source/BootModified.rm18f46j50_g.lkr
+	@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
+	${MP_LD} $(MP_EXTRA_LD_PRE) "source\BootModified.rm18f46j50_g.lkr"  -p$(MP_PROCESSOR_OPTION_LD)  -w  -m"${DISTDIR}/bootloader.X.${IMAGE_TYPE}.map"  -z__MPLAB_BUILD=1  -u_CRUNTIME -l ${MP_CC_DIR}\\..\\lib  -o dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}   
+endif
+
+
+# Subprojects
+.build-subprojects:
+
+
+# Subprojects
+.clean-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+	${RM} -r build/THREEBEEBEE
+	${RM} -r dist/THREEBEEBEE
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES})
+ifneq (${DEPFILES},)
+include ${DEPFILES}
+endif
--- a/EBB_firmware/bootloader.X/nbproject/Makefile-genesis.properties
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-genesis.properties
@ -1,4 +1,15 @@
 #
+<<<<<<< HEAD
+#Sun Apr 26 22:45:49 CDT 2020
+46J50.languagetoolchain.version=3.47
+46J50.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.35\\packs\\Microchip\\PIC18F-J_DFP\\1.2.31
+conf.ids=46J50,45J50,THREEBEEBEE
+45J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=c94b3db824a61d4414f08737756783b5
+THREEBEEBEE.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=c94b3db824a61d4414f08737756783b5
+45J50.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.35\\packs\\Microchip\\PIC18F-J_DFP\\1.2.31
+THREEBEEBEE.languagetoolchain.version=3.47
+configurations-xml=4c84407b1af863d8dc9cfa2c103b2c2b
+=======
 #Fri Nov 29 21:45:14 CST 2019
 46J50.languagetoolchain.version=3.47
 46J50.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.30\\packs\\Microchip\\PIC18F-J_DFP\\1.1.24
@ -6,9 +17,17 @@ conf.ids=46J50,45J50
 45J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b4e9e7bd91ea43579a448f25d09b8b3c
 45J50.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.30\\packs\\Microchip\\PIC18F-J_DFP\\1.1.24
 configurations-xml=7ad545f18f828754d20a3bbd29dd4004
+>>>>>>> f412b1ef90868d51da293495a9151d1fcd4f4675
 46J50.languagetoolchain.dir=C\:\\MCC18\\bin
+THREEBEEBEE.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.35\\packs\\Microchip\\PIC18F-J_DFP\\1.2.31
 45J50.languagetoolchain.version=3.47
 45J50.languagetoolchain.dir=C\:\\MCC18\\bin
+<<<<<<< HEAD
+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3
+46J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=c94b3db824a61d4414f08737756783b5
+THREEBEEBEE.languagetoolchain.dir=C\:\\MCC18\\bin
+=======
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76
 46J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b4e9e7bd91ea43579a448f25d09b8b3c
+>>>>>>> f412b1ef90868d51da293495a9151d1fcd4f4675
 host.platform=windows
--- a/EBB_firmware/bootloader.X/nbproject/Makefile-impl.mk
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-impl.mk
@ -27,11 +27,11 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 PROJECTNAME=bootloader.X

 # Active Configuration
-DEFAULTCONF=46J50
+DEFAULTCONF=THREEBEEBEE
 CONF=${DEFAULTCONF}

 # All Configurations
-ALLCONFS=46J50 45J50 
+ALLCONFS=46J50 45J50 THREEBEEBEE 


 # build
@ -47,6 +47,7 @@ ALLCONFS=46J50 45J50
 .clobber-impl: .clobber-pre .depcheck-impl
 	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=46J50 clean
 	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=45J50 clean
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=THREEBEEBEE clean



@ -54,6 +55,7 @@ ALLCONFS=46J50 45J50
 .all-impl: .all-pre .depcheck-impl
 	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=46J50 build
 	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=45J50 build
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=THREEBEEBEE build



--- a/EBB_firmware/bootloader.X/nbproject/Makefile-local-46J50.mk
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-local-46J50.mk
@ -15,11 +15,19 @@
 # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
 #
 SHELL=cmd.exe
+<<<<<<< HEAD
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/
+# Adding MPLAB X bin directory to path.
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
+# Path to java used to run MPLAB X when this makefile was created
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.35\sys\java\jre1.8.0_181/bin/"
+=======
 PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/
 # Adding MPLAB X bin directory to path.
 PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
 MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.30\sys\java\jre1.8.0_181/bin/"
+>>>>>>> f412b1ef90868d51da293495a9151d1fcd4f4675
 OS_CURRENT="$(shell uname -s)"
 MP_CC="C:\MCC18\bin\mcc18.exe"
 # MP_CPPC is not defined
@ -27,7 +35,11 @@ MP_CC="C:\MCC18\bin\mcc18.exe"
 MP_AS="C:\MCC18\bin\..\mpasm\MPASMWIN.exe"
 MP_LD="C:\MCC18\bin\mplink.exe"
 MP_AR="C:\MCC18\bin\mplib.exe"
+<<<<<<< HEAD
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+=======
 DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+>>>>>>> f412b1ef90868d51da293495a9151d1fcd4f4675
 MP_CC_DIR="C:\MCC18\bin"
 # MP_CPPC_DIR is not defined
 # MP_BC_DIR is not defined
--- a/EBB_firmware/bootloader.X/nbproject/Makefile-local-THREEBEEBEE.mk
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-local-THREEBEEBEE.mk
@ -0,0 +1,38 @@
+#
+# Generated Makefile - do not edit!
+#
+#
+# This file contains information about the location of compilers and other tools.
+# If you commmit this file into your revision control server, you will be able to 
+# to checkout the project and build it from the command line with make. However,
+# if more than one person works on the same project, then this file might show
+# conflicts since different users are bound to have compilers in different places.
+# In that case you might choose to not commit this file and let MPLAB X recreate this file
+# for each user. The disadvantage of not commiting this file is that you must run MPLAB X at
+# least once so the file gets created and the project can be built. Finally, you can also
+# avoid using this file at all if you are only building from the command line with make.
+# You can invoke make with the values of the macros:
+# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
+#
+SHELL=cmd.exe
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/
+# Adding MPLAB X bin directory to path.
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
+# Path to java used to run MPLAB X when this makefile was created
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.35\sys\java\jre1.8.0_181/bin/"
+OS_CURRENT="$(shell uname -s)"
+MP_CC="C:\MCC18\bin\mcc18.exe"
+# MP_CPPC is not defined
+# MP_BC is not defined
+MP_AS="C:\MCC18\bin\..\mpasm\MPASMWIN.exe"
+MP_LD="C:\MCC18\bin\mplink.exe"
+MP_AR="C:\MCC18\bin\mplib.exe"
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="C:\MCC18\bin"
+# MP_CPPC_DIR is not defined
+# MP_BC_DIR is not defined
+MP_AS_DIR="C:\MCC18\bin\..\mpasm"
+MP_LD_DIR="C:\MCC18\bin"
+MP_AR_DIR="C:\MCC18\bin"
+# MP_BC_DIR is not defined
+DFP_DIR="C:/Program Files (x86)/Microchip/MPLABX/v5.35/packs/Microchip/PIC18F-J_DFP/1.2.31"
--- a/EBB_firmware/bootloader.X/nbproject/Makefile-variables.mk
+++ b/EBB_firmware/bootloader.X/nbproject/Makefile-variables.mk
@ -18,3 +18,10 @@ CND_ARTIFACT_PATH_45J50=dist/45J50/production/bootloader.X.production.hex
 CND_PACKAGE_DIR_45J50=${CND_DISTDIR}/45J50/package
 CND_PACKAGE_NAME_45J50=bootloader.x.tar
 CND_PACKAGE_PATH_45J50=${CND_DISTDIR}/45J50/package/bootloader.x.tar
+# THREEBEEBEE configuration
+CND_ARTIFACT_DIR_THREEBEEBEE=dist/THREEBEEBEE/production
+CND_ARTIFACT_NAME_THREEBEEBEE=bootloader.X.production.hex
+CND_ARTIFACT_PATH_THREEBEEBEE=dist/THREEBEEBEE/production/bootloader.X.production.hex
+CND_PACKAGE_DIR_THREEBEEBEE=${CND_DISTDIR}/THREEBEEBEE/package
+CND_PACKAGE_NAME_THREEBEEBEE=bootloader.x.tar
+CND_PACKAGE_PATH_THREEBEEBEE=${CND_DISTDIR}/THREEBEEBEE/package/bootloader.x.tar
--- a/EBB_firmware/bootloader.X/nbproject/Package-THREEBEEBEE.bash
+++ b/EBB_firmware/bootloader.X/nbproject/Package-THREEBEEBEE.bash
@ -0,0 +1,73 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_CONF=THREEBEEBEE
+CND_DISTDIR=dist
+TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_BASENAME=bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+PACKAGE_TOP_DIR=bootloader.x/
+
+# Functions
+function checkReturnCode
+{
+    rc=$?
+    if [ $rc != 0 ]
+    then
+        exit $rc
+    fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+    mkdir -p "$1"
+    checkReturnCode
+    if [ "$2" != "" ]
+    then
+      chmod $2 "$1"
+      checkReturnCode
+    fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+    cp "$1" "$2"
+    checkReturnCode
+    if [ "$3" != "" ]
+    then
+        chmod $3 "$2"
+        checkReturnCode
+    fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/package
+rm -rf ${TMPDIR}
+mkdir -p ${TMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory ${TMPDIR}/bootloader.x/bin
+copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/package/bootloader.x.tar
+cd ${TMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/bootloader.x.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${TMPDIR}
--- a/EBB_firmware/bootloader.X/nbproject/configurations.xml
+++ b/EBB_firmware/bootloader.X/nbproject/configurations.xml
@ -58,13 +58,13 @@
        <targetDevice>PIC18F46J50</targetDevice>
        <targetHeader></targetHeader>
        <targetPluginBoard></targetPluginBoard>
-        <platformTool>PICkit3PlatformTool</platformTool>
+        <platformTool>noID</platformTool>
        <languageToolchain>C18</languageToolchain>
        <languageToolchainVersion>3.47</languageToolchainVersion>
        <platform>3</platform>
      </toolsSet>
      <packs>
-        <pack name="PIC18F-J_DFP" vendor="Microchip" version="1.0.10"/>
+        <pack name="PIC18F-J_DFP" vendor="Microchip" version="1.2.31"/>
      </packs>
      <compileType>
        <linkerTool>
@ -146,25 +146,37 @@
        <property key="ToolFirmwareFilePath"
                  value="Press to browse for a specific firmware version"/>
        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+        <property key="debugoptions.useswbreakpoints" value="false"/>
        <property key="hwtoolclock.frcindebug" value="false"/>
        <property key="memories.aux" value="false"/>
        <property key="memories.bootflash" value="false"/>
        <property key="memories.configurationmemory" value="false"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
        <property key="memories.eeprom" value="false"/>
        <property key="memories.flashdata" value="true"/>
        <property key="memories.id" value="false"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges}"/>
        <property key="memories.programmemory" value="true"/>
-        <property key="memories.programmemory.end" value="0xfff7"/>
-        <property key="memories.programmemory.start" value="0x0"/>
+        <property key="memories.programmemory.ranges" value="0-fff7"/>
        <property key="poweroptions.powerenable" value="true"/>
        <property key="programmertogo.imagename" value=""/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
        <property key="programoptions.eraseb4program" value="true"/>
        <property key="programoptions.pgmspeed" value="2"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preservedataflash.ranges"
+                  value="${programoptions.preservedataflash.ranges}"/>
        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom.ranges" value=""/>
+        <property key="programoptions.preserveprogram.ranges" value=""/>
        <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.preserveprogramrange.end" value="0xfff7"/>
-        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
        <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
+        <property key="programoptions.testmodeentrymethod" value="VDDFirst"/>
        <property key="programoptions.usehighvoltageonmclr" value="false"/>
        <property key="programoptions.uselvpprogramming" value="false"/>
        <property key="voltagevalue" value="3.25"/>
@ -186,13 +198,13 @@
        <targetDevice>PIC18F45J50</targetDevice>
        <targetHeader></targetHeader>
        <targetPluginBoard></targetPluginBoard>
-        <platformTool>ICD3PlatformTool</platformTool>
+        <platformTool>noID</platformTool>
        <languageToolchain>C18</languageToolchain>
        <languageToolchainVersion>3.47</languageToolchainVersion>
        <platform>3</platform>
      </toolsSet>
      <packs>
-        <pack name="PIC18F-J_DFP" vendor="Microchip" version="1.0.10"/>
+        <pack name="PIC18F-J_DFP" vendor="Microchip" version="1.2.31"/>
      </packs>
      <compileType>
        <linkerTool>
@ -267,6 +279,45 @@
        <property key="stack-analysis-mcc18" value="false"/>
        <property key="stack-analysis-mplink" value="false"/>
      </C18LanguageToolchain>
+      <ICD3PlatformTool>
+        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="Freeze Peripherals" value="true"/>
+        <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
+        <property key="ToolFirmwareFilePath"
+                  value="Press to browse for a specific firmware version"/>
+        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+        <property key="debugoptions.useswbreakpoints" value="false"/>
+        <property key="hwtoolclock.frcindebug" value="false"/>
+        <property key="memories.aux" value="false"/>
+        <property key="memories.bootflash" value="false"/>
+        <property key="memories.configurationmemory" value="true"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
+        <property key="memories.eeprom" value="true"/>
+        <property key="memories.flashdata" value="true"/>
+        <property key="memories.id" value="true"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges}"/>
+        <property key="memories.programmemory" value="true"/>
+        <property key="memories.programmemory.ranges" value="0-7ff7"/>
+        <property key="poweroptions.powerenable" value="false"/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
+        <property key="programoptions.eraseb4program" value="true"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preservedataflash.ranges" value=""/>
+        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom.ranges" value=""/>
+        <property key="programoptions.preserveprogram.ranges" value=""/>
+        <property key="programoptions.preserveprogramrange" value="false"/>
+        <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
+        <property key="programoptions.testmodeentrymethod" value="VDDFirst"/>
+        <property key="programoptions.usehighvoltageonmclr" value="false"/>
+        <property key="programoptions.uselvpprogramming" value="false"/>
+        <property key="voltagevalue" value="3.25"/>
+      </ICD3PlatformTool>
      <item path="source/BootModified.rm18f46j50_g.lkr" ex="true" overriding="false">
        <C18>
        </C18>
@ -278,5 +329,145 @@
        </C18LanguageToolchain>
      </item>
    </conf>
+    <conf name="THREEBEEBEE" type="2">
+      <toolsSet>
+        <developmentServer>localhost</developmentServer>
+        <targetDevice>PIC18F46J50</targetDevice>
+        <targetHeader></targetHeader>
+        <targetPluginBoard></targetPluginBoard>
+        <platformTool>PICkit3PlatformTool</platformTool>
+        <languageToolchain>C18</languageToolchain>
+        <languageToolchainVersion>3.47</languageToolchainVersion>
+        <platform>3</platform>
+      </toolsSet>
+      <packs>
+        <pack name="PIC18F-J_DFP" vendor="Microchip" version="1.2.31"/>
+      </packs>
+      <compileType>
+        <linkerTool>
+          <linkerLibItems>
+          </linkerLibItems>
+        </linkerTool>
+        <archiverTool>
+        </archiverTool>
+        <loading>
+          <useAlternateLoadableFile>false</useAlternateLoadableFile>
+          <parseOnProdLoad>false</parseOnProdLoad>
+          <alternateLoadableFile></alternateLoadableFile>
+        </loading>
+        <subordinates>
+        </subordinates>
+      </compileType>
+      <makeCustomizationType>
+        <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
+        <makeCustomizationPreStep></makeCustomizationPreStep>
+        <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
+        <makeCustomizationPostStep></makeCustomizationPostStep>
+        <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
+        <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
+        <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
+      </makeCustomizationType>
+      <C18>
+        <property key="code-model" value="ms"/>
+        <property key="data-model" value="oa-"/>
+        <property key="default-char-unsigned" value="false"/>
+        <property key="enable-all-optimizations" value="true"/>
+        <property key="enable-int-promotion" value="false"/>
+        <property key="enable-multi-bank-stack-model" value="false"/>
+        <property key="enable-ob" value="true"/>
+        <property key="enable-od" value="true"/>
+        <property key="enable-om" value="true"/>
+        <property key="enable-on" value="true"/>
+        <property key="enable-op" value="true"/>
+        <property key="enable-opa" value="true"/>
+        <property key="enable-or" value="true"/>
+        <property key="enable-os" value="true"/>
+        <property key="enable-ot" value="true"/>
+        <property key="enable-ou" value="true"/>
+        <property key="enable-ow" value="true"/>
+        <property key="extra-include-directories" value="."/>
+        <property key="optimization-master" value="Custom"/>
+        <property key="preprocessor-macros" value="THREEBEEBEE_V10"/>
+        <property key="procedural-abstraction-passes" value="0"/>
+        <property key="storage-class" value="sca"/>
+        <property key="verbose" value="false"/>
+        <property key="warning-level" value="2"/>
+      </C18>
+      <C18-AS>
+        <property key="cross.reference.file" value=""/>
+        <property key="default.radix" value="HEX"/>
+        <property key="enable.case.sensitivity" value="false"/>
+        <property key="hex.output.format" value="INHX32"/>
+        <property key="preprocessor.macros" value=""/>
+        <property key="warning.level" value="0"/>
+      </C18-AS>
+      <C18-LD>
+        <property key="cod-file" value="false"/>
+        <property key="extra-lib-directories" value=""/>
+        <property key="hex-output-format" value="INHX32"/>
+        <property key="map-file" value="&quot;${DISTDIR}/bootloader.X.${IMAGE_TYPE}.map&quot;"/>
+      </C18-LD>
+      <C18LanguageToolchain>
+        <property key="extended-mode" value="false"/>
+        <property key="extended-mode-mcc18" value="false"/>
+        <property key="extended-mode-mpasm" value="false"/>
+        <property key="extended-mode-mplink" value="false"/>
+        <property key="stack-analysis" value="false"/>
+        <property key="stack-analysis-mcc18" value="false"/>
+        <property key="stack-analysis-mplink" value="false"/>
+      </C18LanguageToolchain>
+      <PICkit3PlatformTool>
+        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="Freeze Peripherals" value="true"/>
+        <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
+        <property key="ToolFirmwareFilePath"
+                  value="Press to browse for a specific firmware version"/>
+        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+        <property key="debugoptions.useswbreakpoints" value="false"/>
+        <property key="hwtoolclock.frcindebug" value="false"/>
+        <property key="memories.aux" value="false"/>
+        <property key="memories.bootflash" value="false"/>
+        <property key="memories.configurationmemory" value="false"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
+        <property key="memories.eeprom" value="false"/>
+        <property key="memories.flashdata" value="true"/>
+        <property key="memories.id" value="false"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges}"/>
+        <property key="memories.programmemory" value="true"/>
+        <property key="memories.programmemory.ranges" value="0-fff7"/>
+        <property key="poweroptions.powerenable" value="false"/>
+        <property key="programmertogo.imagename" value=""/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
+        <property key="programoptions.eraseb4program" value="true"/>
+        <property key="programoptions.pgmspeed" value="2"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preservedataflash.ranges"
+                  value="${programoptions.preservedataflash.ranges}"/>
+        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom.ranges" value=""/>
+        <property key="programoptions.preserveprogram.ranges" value=""/>
+        <property key="programoptions.preserveprogramrange" value="false"/>
+        <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
+        <property key="programoptions.testmodeentrymethod" value="VDDFirst"/>
+        <property key="programoptions.usehighvoltageonmclr" value="false"/>
+        <property key="programoptions.uselvpprogramming" value="false"/>
+        <property key="voltagevalue" value="3.25"/>
+      </PICkit3PlatformTool>
+      <item path="source/BootModified.rm18f45j50_g.lkr" ex="true" overriding="false">
+        <C18>
+        </C18>
+        <C18-AS>
+        </C18-AS>
+        <C18-LD>
+        </C18-LD>
+        <C18LanguageToolchain>
+        </C18LanguageToolchain>
+      </item>
+    </conf>
  </confs>
 </configurationDescriptor>
--- a/EBB_firmware/bootloader.X/nbproject/private/configurations.xml
+++ b/EBB_firmware/bootloader.X/nbproject/private/configurations.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configurationDescriptor version="65">
  <projectmakefile>Makefile</projectmakefile>
-  <defaultConf>0</defaultConf>
+  <defaultConf>2</defaultConf>
  <confs>
    <conf name="46J50" type="2">
-      <platformToolSN>:=MPLABCommUSB:=04D8:=900A:=0002:=Microchip Technology Inc.:=PICkit 3:=BUR121081920:=x:=en</platformToolSN>
+      <platformToolSN>noToolString</platformToolSN>
      <languageToolchainDir>C:\MCC18\bin</languageToolchainDir>
      <mdbdebugger version="1">
        <placeholder1>place holder 1</placeholder1>
@ -22,7 +22,25 @@
      </runprofile>
    </conf>
    <conf name="45J50" type="2">
-      <platformToolSN>:=MPLABCommUSB:=04D8:=9009:=0100:=Microchip Technology, Inc. (www.microchip.com):=MPLAB ICD3 tm (www.microchip.com):=JIT091597204:=x:=en</platformToolSN>
+      <platformToolSN>noToolString</platformToolSN>
+      <languageToolchainDir>C:\MCC18\bin</languageToolchainDir>
+      <mdbdebugger version="1">
+        <placeholder1>place holder 1</placeholder1>
+        <placeholder2>place holder 2</placeholder2>
+      </mdbdebugger>
+      <runprofile version="6">
+        <args></args>
+        <rundir></rundir>
+        <buildfirst>true</buildfirst>
+        <console-type>0</console-type>
+        <terminal-type>0</terminal-type>
+        <remove-instrumentation>0</remove-instrumentation>
+        <environment>
+        </environment>
+      </runprofile>
+    </conf>
+    <conf name="THREEBEEBEE" type="2">
+      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>900A:=&lt;rev>0002:=&lt;man>Microchip Technology Inc.:=&lt;prod>PICkit 3:=&lt;sn>BUR101260159:=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
      <languageToolchainDir>C:\MCC18\bin</languageToolchainDir>
      <mdbdebugger version="1">
        <placeholder1>place holder 1</placeholder1>
--- a/EBB_firmware/bootloader.X/nbproject/private/private.xml
+++ b/EBB_firmware/bootloader.X/nbproject/private/private.xml
@ -3,6 +3,11 @@
    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/D:/Projects/EggBot4-GH/EBB_firmware/bootloader.X/source/io_cfg.h</file>
+            <file>file:/D:/Projects/EggBot4-GH/EBB_firmware/bootloader.X/source/usbcfg.h</file>
+            <file>file:/D:/Projects/EggBot4-GH/EBB_firmware/bootloader.X/source/main.c</file>
+            <file>file:/D:/Projects/EggBot4-GH/EBB_firmware/bootloader.X/source/Boot46J50Family.h</file>
+        </group>
    </open-files>
 </project-private>
--- a/EBB_firmware/bootloader.X/nbproject/project.xml
+++ b/EBB_firmware/bootloader.X/nbproject/project.xml
@ -22,6 +22,10 @@
                    <name>45J50</name>
                    <type>2</type>
                </confElem>
+                <confElem>
+                    <name>THREEBEEBEE</name>
+                    <type>2</type>
+                </confElem>
            </confList>
            <formatting>
                <project-formatting-style>false</project-formatting-style>
--- a/EBB_firmware/bootloader.X/source/io_cfg.h
+++ b/EBB_firmware/bootloader.X/source/io_cfg.h
@ -118,6 +118,43 @@

 #define sw2                 PORTAbits.RA7

+#elif defined(THREEBEEBEE_V10)
+/** U S B ***********************************************************/
+//#define tris_usb_bus_sense  TRISAbits.TRISA7    // Input
+
+#if defined(USE_USB_BUS_SENSE_IO)
+#define usb_bus_sense       PORTAbits.RA7
+#else
+#define usb_bus_sense       1
+#endif
+
+#define self_power          0
+
+///** L E D ***********************************************************/
+// USB (GREEN) LED = RD3
+// USR (RED) LED = RD2
+#define mInitAllLEDs()      LATDbits.LATD3 = 0; LATDbits.LATD2 = 0; TRISDbits.TRISD3 = 0; TRISDbits.TRISD2 = 0;
+
+#define mLED_1              LATDbits.LATD3
+#define mLED_2              LATDbits.LATD2
+
+#define mLED_1_On()         mLED_1 = 1;
+#define mLED_2_On()         mLED_2 = 1;
+
+#define mLED_1_Off()        mLED_1 = 0;
+#define mLED_2_Off()        mLED_2 = 0;
+
+#define mLED_1_Toggle()     mLED_1 = !mLED_1;
+#define mLED_2_Toggle()     mLED_2 = !mLED_2;
+//
+///** S W I T C H *****************************************************/
+// PRG switch = RA7
+#define mInitAllSwitches()  TRISAbits.TRISA6=1;
+#define mInitSwitch2()      TRISAbits.TRISA6=1;
+
+#define sw2                 PORTAbits.RA6
+
+
 /********************************************************************/
 /********************************************************************/
 /********************************************************************/
--- a/EBB_firmware/bootloader.X/source/main.c
+++ b/EBB_firmware/bootloader.X/source/main.c
@ -117,7 +117,7 @@ project will have to be modified to make the BootPage section larger.
 #include "typedefs.h"                   
 #include "usb.h"                         
 #include "io_cfg.h"                     
-#if defined(EBB_V11)
+#if defined(EBB_V11) || defined(THREEBEEBEE_V10)
 	#include "Boot46J50Family.h"
 #elif defined(EBB_V10)
 	#include "Boot87J50Family.h"
@ -153,7 +153,7 @@ project will have to be modified to make the BootPage section larger.
     #pragma config WPCFG = OFF          //Write/Erase last page protect Disabled
     #pragma config WPDIS = OFF          //WPFP[5:0], WPEND, and WPCFG bits ignored 
 //If using the YOUR_BOARD hardware platform (see usbcfg.h), uncomment below and add pragmas
-#elif defined(EBB_V11)
+#elif defined(EBB_V11) || defined(THREEBEEBEE_V10)
   	 #pragma config WDTEN = OFF          //WDT disabled (enabled by SWDTEN bit)
     #pragma config PLLDIV = 2           //Divide by 2 (8 MHz internal oscillator)
     #pragma config STVREN = ON          //stack overflow/underflow reset enabled
--- a/EBB_firmware/bootloader.X/source/usbcfg.h
+++ b/EBB_firmware/bootloader.X/source/usbcfg.h
@ -65,6 +65,9 @@
 #elif defined(EBB_V11)
 	//#define USE_SELF_POWER_SENSE_IO	//See MCHPFSUSB Firmware User's Guide
   	//#define USE_USB_BUS_SENSE_IO		//(DS51679) for more details about these features.
+#elif defined(THREEBEEBEE_V10)
+	//#define USE_SELF_POWER_SENSE_IO	//See MCHPFSUSB Firmware User's Guide
+  //#define USE_USB_BUS_SENSE_IO		//(DS51679) for more details about these features.
 #elif defined(PIC18F46J50_PIM)
    //#define USE_USB_BUS_SENSE_IO		//JP1 must be in R-U position to use this feature on this board