From be339d49fcfd3a09b8fdf590001e8e0f4369e4d3 Mon Sep 17 00:00:00 2001 From: Joshua Drake Date: Wed, 27 Mar 2024 09:38:12 -0500 Subject: Safety commit. --- .../2fcbb31718e142a71b3fe65ee8c43367f0a0455b | 1 + .../4297c9472f1e68e5f2af2a9312fe6969293a79fe | 1 + Arduino/main.c/main.c.ino | 134 +++++------- SPI.c | 7 +- build/default/production/SPI.o | Bin 13816 -> 13892 bytes build/default/production/main.o | Bin 6464 -> 6624 bytes .../mcc_generated_files/interrupt_manager.o | Bin 5452 -> 6536 bytes .../production/mcc_generated_files/mssp2_i2c.o | Bin 17456 -> 17860 bytes .../production/mcc_generated_files/system.o | Bin 6600 -> 6648 bytes .../production/mcc_generated_files/system.o.d | 7 +- .../default/production/mcc_generated_files/tmr1.o | Bin 0 -> 14140 bytes .../production/mcc_generated_files/tmr1.o.d | 4 + main.c | 24 ++- nbproject/Makefile-default.mk | 22 +- nbproject/Makefile-genesis.properties | 4 +- nbproject/configurations.xml | 2 + resbox.mc3 | 240 ++++++++++++++++++++- 17 files changed, 338 insertions(+), 108 deletions(-) create mode 100644 .generated_files/flags/default/2fcbb31718e142a71b3fe65ee8c43367f0a0455b create mode 100644 .generated_files/flags/default/4297c9472f1e68e5f2af2a9312fe6969293a79fe create mode 100644 build/default/production/mcc_generated_files/tmr1.o create mode 100644 build/default/production/mcc_generated_files/tmr1.o.d diff --git a/.generated_files/flags/default/2fcbb31718e142a71b3fe65ee8c43367f0a0455b b/.generated_files/flags/default/2fcbb31718e142a71b3fe65ee8c43367f0a0455b new file mode 100644 index 0000000..b908196 --- /dev/null +++ b/.generated_files/flags/default/2fcbb31718e142a71b3fe65ee8c43367f0a0455b @@ -0,0 +1 @@ + -c -mcpu=$(MP_PROCESSOR_OPTION) -g -D__DEBUG -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16"/home/josh/MPLABXProjects/resbox.X/mcc_generated_files/tmr1.c \ No newline at end of file diff --git a/.generated_files/flags/default/4297c9472f1e68e5f2af2a9312fe6969293a79fe b/.generated_files/flags/default/4297c9472f1e68e5f2af2a9312fe6969293a79fe new file mode 100644 index 0000000..3043c4f --- /dev/null +++ b/.generated_files/flags/default/4297c9472f1e68e5f2af2a9312fe6969293a79fe @@ -0,0 +1 @@ + -c -mcpu=$(MP_PROCESSOR_OPTION) -g -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16"/home/josh/MPLABXProjects/resbox.X/mcc_generated_files/tmr1.c \ No newline at end of file diff --git a/Arduino/main.c/main.c.ino b/Arduino/main.c/main.c.ino index ff5d2ee..cf6ea90 100644 --- a/Arduino/main.c/main.c.ino +++ b/Arduino/main.c/main.c.ino @@ -1,91 +1,71 @@ #include -double VOLTAGE; -double P150; -double P100; -double load = 0; -int Q150; -int Q100; -int amongus = 0; -void setup() +double VOLTAGE, P100, P150; +double temp, load = 0; +uint8_t Q100, Q150; +bool new_message = false; + +void setup() { Wire.begin(); Serial.begin(9600); - //Serial.println("Enter Nominal System Voltage:"); - //while (Serial.available() == 0){;} - //VOLTAGE = Serial.parseFloat(SKIP_ALL); - //Serial.print("System Voltage: "); - //Serial.println(VOLTAGE, DEC); - //P150 = (VOLTAGE*VOLTAGE)/150; - //P100 = (VOLTAGE*VOLTAGE)/100; - //Serial.println("Enter Load in kW:"); - + Serial.println("Enter Nominal System Voltage:"); + while (Serial.available() == 0) {;} + VOLTAGE = Serial.parseFloat(SKIP_ALL); + Serial.print("System Voltage: "); + Serial.println(VOLTAGE, DEC); + P150 = (VOLTAGE * VOLTAGE) / 150; + P100 = (VOLTAGE * VOLTAGE) / 100; + Serial.println("Enter Load in kW:"); } -void loop() +void loop() { + new_message = false; Serial.flush(); - //while (!Serial.available()){;} - //double temp = Serial.parseFloat(SKIP_ALL)*1000; - //int temp = Serial.parseInt(SKIP_ALL); - //Serial.println(temp, DEC); - -// if((temp != load)&&(temp > 0)) -// { -// load = temp; -// if(VOLTAGE <= 500) //We don't want to use the 100ohm resistors if the voltage is higher than 500 as they would draw excessive power. -// { -// Q100 = load/P100; -// if(Q100 > 5) Q100=5; -// Q150 = (load - (Q100*P100))/P150; -// } -// else -// { -// Q150 = load/P150; -// Q100 = 0; -// } -// if(Q150 > 15) Q150 = 15; -// Serial.print("A combination of "); -// Serial.print(Q150, DEC); -// Serial.print(" 150ohm and "); -// Serial.print(Q100, DEC); -// Serial.print(" 100ohm resistors will be activated. "); -// //Serial.print(load - ((P150*Q150)+(P100*Q100)),DEC); -// Serial.print(((P150*Q150)+(P100*Q100)),DEC); -// Serial.println("W Accounted for."); -// } - + if (Serial.available())temp = Serial.parseFloat(SKIP_ALL) * 1000; -// delay(25); -// Serial.print(amongus, DEC); -// Serial.print(" "); - Wire.requestFrom(0x30, 1); - while(Wire.available()) { - int c = Wire.read(); // Receive a byte as character - Serial.println(c); // Print the character + if ((temp != load) && (temp > 0)) + { + load = temp; + if (VOLTAGE <= 500) //We don't want to use the 100ohm resistors if the voltage is higher than 500 as they would draw excessive power. + { + Q100 = load / P100; + if (Q100 > 5) Q100 = 5; + Q150 = (load - (Q100 * P100)) / P150; } - delay(100); -// - if(amongus > 32)amongus=0; -// Wire.beginTransmission(0x30); //Controller Board Has Address 0x07 -//// //Wire.write((Q150 << 3) & Q150); -// Wire.write(amongus++); -// Wire.write(150); -// Wire.endTransmission(); - - //for(int x = 0; x <32;x++){ - delay(5); - amongus++; - //Serial.print("Increment Value"); - //Serial.println(amongus); + else + { + Q150 = load / P150; + Q100 = 0; + } + if (Q150 > 15) Q150 = 15; + Serial.print("A combination of "); + Serial.print(Q150, DEC); + Serial.print(" 150ohm and "); + Serial.print(Q100, DEC); + Serial.print(" 100ohm resistors will be requested. "); + //Serial.print(load - ((P150*Q150)+(P100*Q100)),DEC); + Serial.print(((P150 * Q150) + (P100 * Q100)), DEC); + Serial.println("W Accounted for."); + new_message = true; + } + delay(50); Wire.beginTransmission(0x30); //Controller Board Has Address 0x07 - //Wire.write((Q150 << 3) & Q150); - Wire.write(amongus); - //Wire.write(amongus); + Wire.write(0x01); //First "EEPROM Address" stores resistor data. + Wire.write((Q100 << 4) | Q150); Wire.endTransmission(); - delay(50); -// Wire.beginTransmission(0x30); //Controller Board Has Address 0x07 -// //Wire.write((Q150 << 3) & Q150); -// //Wire.write(amongus); -// Wire.endTransmission(); + + + if (new_message == true) { + delay(25); + Wire.requestFrom(0x30, 1); + while (!Wire.available()) {;} + int c = Wire.read(); + Serial.print("Quantity of 150Ohm: "); + Serial.print(c & 0b00001111); //Print Q150 + Serial.print(" Quantity of 100Ohm: "); + Serial.print((c & 0b01110000)>>4); + Serial.println(" was recieved."); + } } diff --git a/SPI.c b/SPI.c index d4471ce..3fac0f3 100644 --- a/SPI.c +++ b/SPI.c @@ -32,9 +32,10 @@ if (Ohm_68 > 5) Ohm_68 = 5; //WriteBuffer[0] = WriteBuffer[2] = WriteBuffer[4] = (write << 8) | (!write << 7) | 0b000000; WriteBuffer[0] = WriteBuffer[2] = WriteBuffer[4] = 0b10000000; - WriteBuffer[1] = (0xFF << Ohm_150) ^ (0xFF); - WriteBuffer[3] = (0xFF << (Ohm_150 - 8)) ^ (0xFF); - WriteBuffer[5] = (0xFF << (Ohm_68 - 4)) ^ (0xFF) | testLED; + WriteBuffer[5] = !(0xFF << Ohm_150); + WriteBuffer[3] = !(0xFF << (Ohm_150 - 8)) | ((Ohm_68 - 4) << 7); + WriteBuffer[1] = !(0xFF << (Ohm_68 - 1)) | (testLED << 7); + //WriteBuffer[1] = 0xFF; //if (Ohm_68 == 5) WriteBuffer[3]|= 0b10000000; readData = MSSP1_SPI_Exchange8bitBuffer(WriteBuffer, 6, ReadBuffer); } diff --git a/build/default/production/SPI.o b/build/default/production/SPI.o index 6b7cfb6..8ee6668 100644 Binary files a/build/default/production/SPI.o and b/build/default/production/SPI.o differ diff --git a/build/default/production/main.o b/build/default/production/main.o index ca480ed..fbb4ed5 100644 Binary files a/build/default/production/main.o and b/build/default/production/main.o differ diff --git a/build/default/production/mcc_generated_files/interrupt_manager.o b/build/default/production/mcc_generated_files/interrupt_manager.o index 8e18d22..f1bcec1 100644 Binary files a/build/default/production/mcc_generated_files/interrupt_manager.o and b/build/default/production/mcc_generated_files/interrupt_manager.o differ diff --git a/build/default/production/mcc_generated_files/mssp2_i2c.o b/build/default/production/mcc_generated_files/mssp2_i2c.o index c9b3a3f..3a2414a 100644 Binary files a/build/default/production/mcc_generated_files/mssp2_i2c.o and b/build/default/production/mcc_generated_files/mssp2_i2c.o differ diff --git a/build/default/production/mcc_generated_files/system.o b/build/default/production/mcc_generated_files/system.o index 7758e51..5c07f72 100644 Binary files a/build/default/production/mcc_generated_files/system.o and b/build/default/production/mcc_generated_files/system.o differ diff --git a/build/default/production/mcc_generated_files/system.o.d b/build/default/production/mcc_generated_files/system.o.d index e35c712..2d4018a 100644 --- a/build/default/production/mcc_generated_files/system.o.d +++ b/build/default/production/mcc_generated_files/system.o.d @@ -1,8 +1,9 @@ build/default/production/mcc_generated_files/system.o: \ mcc_generated_files/system.c mcc_generated_files/pin_manager.h \ mcc_generated_files/clock.h mcc_generated_files/system.h \ - mcc_generated_files/interrupt_manager.h mcc_generated_files/traps.h \ - mcc_generated_files/mssp1_spi.h mcc_generated_files/mssp2_i2c.h + mcc_generated_files/tmr1.h mcc_generated_files/interrupt_manager.h \ + mcc_generated_files/traps.h mcc_generated_files/mssp1_spi.h \ + mcc_generated_files/mssp2_i2c.h mcc_generated_files/pin_manager.h: @@ -10,6 +11,8 @@ mcc_generated_files/clock.h: mcc_generated_files/system.h: +mcc_generated_files/tmr1.h: + mcc_generated_files/interrupt_manager.h: mcc_generated_files/traps.h: diff --git a/build/default/production/mcc_generated_files/tmr1.o b/build/default/production/mcc_generated_files/tmr1.o new file mode 100644 index 0000000..b23f323 Binary files /dev/null and b/build/default/production/mcc_generated_files/tmr1.o differ diff --git a/build/default/production/mcc_generated_files/tmr1.o.d b/build/default/production/mcc_generated_files/tmr1.o.d new file mode 100644 index 0000000..012d0c8 --- /dev/null +++ b/build/default/production/mcc_generated_files/tmr1.o.d @@ -0,0 +1,4 @@ +build/default/production/mcc_generated_files/tmr1.o: \ + mcc_generated_files/tmr1.c mcc_generated_files/tmr1.h + +mcc_generated_files/tmr1.h: diff --git a/main.c b/main.c index 2750ee8..8625c42 100644 --- a/main.c +++ b/main.c @@ -66,23 +66,26 @@ int main(void) Message_HWCR(nullarray); SPI_slaveDeselect(); - _LATB6 = 1; + _LATB6 = 0; _LATB7 = 1; _LATB8 = 1; //MSSP2_I2C_ReadPointerSet(0b00000011); // MSSP2_I2C_WritePointerSet(0x00); - uint8_t *buffer; - uint8_t *status; - while (1) { - //MSSP2_I2C_ReadPointerSet(0b00000011); - //MSSP2_I2C_ReadPointerSet(0b00000011); - //SPI_slaveSelect(); - //Message_OUT(15, 5, 0); - //SPI_slaveDeselect(); + + if (_LATB8) { + SPI_slaveSelect(); + Message_OUT(15, 5, 1); + SPI_slaveDeselect(); + } + else { + SPI_slaveSelect(); + Message_OUT(15, 5, 0); + SPI_slaveDeselect(); + } /* SPI_slaveSelect(); Message_OUT(15, 5, 0); @@ -98,6 +101,9 @@ int main(void) * * */ + //SPI_slaveSelect(); + //Message_OUT(15, i2cArray[1] >> 4, 0); + //SPI_slaveDeselect(); //if(MSSP2_I2C_WritePointerGet() > 50) {_LATB7 = 0; _LATB6 = 1;} //else {_LATB6 = 0; _LATB7 = 1;} } diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index db92572..9b67df6 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -51,17 +51,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=mcc_generated_files/interrupt_manager.c mcc_generated_files/clock.c mcc_generated_files/pin_manager.c mcc_generated_files/mssp2_i2c.c mcc_generated_files/system.c mcc_generated_files/traps.c mcc_generated_files/mcc.c mcc_generated_files/mssp1_spi.c main.c SPI.c +SOURCEFILES_QUOTED_IF_SPACED=mcc_generated_files/interrupt_manager.c mcc_generated_files/clock.c mcc_generated_files/pin_manager.c mcc_generated_files/mssp2_i2c.c mcc_generated_files/system.c mcc_generated_files/traps.c mcc_generated_files/mcc.c mcc_generated_files/mssp1_spi.c main.c SPI.c mcc_generated_files/tmr1.c # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o ${OBJECTDIR}/mcc_generated_files/clock.o ${OBJECTDIR}/mcc_generated_files/pin_manager.o ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o ${OBJECTDIR}/mcc_generated_files/system.o ${OBJECTDIR}/mcc_generated_files/traps.o ${OBJECTDIR}/mcc_generated_files/mcc.o ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o ${OBJECTDIR}/main.o ${OBJECTDIR}/SPI.o -POSSIBLE_DEPFILES=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o.d ${OBJECTDIR}/mcc_generated_files/clock.o.d ${OBJECTDIR}/mcc_generated_files/pin_manager.o.d ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o.d ${OBJECTDIR}/mcc_generated_files/system.o.d ${OBJECTDIR}/mcc_generated_files/traps.o.d ${OBJECTDIR}/mcc_generated_files/mcc.o.d ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o.d ${OBJECTDIR}/main.o.d ${OBJECTDIR}/SPI.o.d +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o ${OBJECTDIR}/mcc_generated_files/clock.o ${OBJECTDIR}/mcc_generated_files/pin_manager.o ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o ${OBJECTDIR}/mcc_generated_files/system.o ${OBJECTDIR}/mcc_generated_files/traps.o ${OBJECTDIR}/mcc_generated_files/mcc.o ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o ${OBJECTDIR}/main.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/mcc_generated_files/tmr1.o +POSSIBLE_DEPFILES=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o.d ${OBJECTDIR}/mcc_generated_files/clock.o.d ${OBJECTDIR}/mcc_generated_files/pin_manager.o.d ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o.d ${OBJECTDIR}/mcc_generated_files/system.o.d ${OBJECTDIR}/mcc_generated_files/traps.o.d ${OBJECTDIR}/mcc_generated_files/mcc.o.d ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o.d ${OBJECTDIR}/main.o.d ${OBJECTDIR}/SPI.o.d ${OBJECTDIR}/mcc_generated_files/tmr1.o.d # Object Files -OBJECTFILES=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o ${OBJECTDIR}/mcc_generated_files/clock.o ${OBJECTDIR}/mcc_generated_files/pin_manager.o ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o ${OBJECTDIR}/mcc_generated_files/system.o ${OBJECTDIR}/mcc_generated_files/traps.o ${OBJECTDIR}/mcc_generated_files/mcc.o ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o ${OBJECTDIR}/main.o ${OBJECTDIR}/SPI.o +OBJECTFILES=${OBJECTDIR}/mcc_generated_files/interrupt_manager.o ${OBJECTDIR}/mcc_generated_files/clock.o ${OBJECTDIR}/mcc_generated_files/pin_manager.o ${OBJECTDIR}/mcc_generated_files/mssp2_i2c.o ${OBJECTDIR}/mcc_generated_files/system.o ${OBJECTDIR}/mcc_generated_files/traps.o ${OBJECTDIR}/mcc_generated_files/mcc.o ${OBJECTDIR}/mcc_generated_files/mssp1_spi.o ${OBJECTDIR}/main.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/mcc_generated_files/tmr1.o # Source Files -SOURCEFILES=mcc_generated_files/interrupt_manager.c mcc_generated_files/clock.c mcc_generated_files/pin_manager.c mcc_generated_files/mssp2_i2c.c mcc_generated_files/system.c mcc_generated_files/traps.c mcc_generated_files/mcc.c mcc_generated_files/mssp1_spi.c main.c SPI.c +SOURCEFILES=mcc_generated_files/interrupt_manager.c mcc_generated_files/clock.c mcc_generated_files/pin_manager.c mcc_generated_files/mssp2_i2c.c mcc_generated_files/system.c mcc_generated_files/traps.c mcc_generated_files/mcc.c mcc_generated_files/mssp1_spi.c main.c SPI.c mcc_generated_files/tmr1.c @@ -149,6 +149,12 @@ ${OBJECTDIR}/SPI.o: SPI.c .generated_files/flags/default/203b05fee3c9c630c59c4d @${RM} ${OBJECTDIR}/SPI.o ${MP_CC} $(MP_EXTRA_CC_PRE) SPI.c -o ${OBJECTDIR}/SPI.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MP -MMD -MF "${OBJECTDIR}/SPI.o.d" -g -D__DEBUG -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16" +${OBJECTDIR}/mcc_generated_files/tmr1.o: mcc_generated_files/tmr1.c .generated_files/flags/default/2fcbb31718e142a71b3fe65ee8c43367f0a0455b .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709 + @${MKDIR} "${OBJECTDIR}/mcc_generated_files" + @${RM} ${OBJECTDIR}/mcc_generated_files/tmr1.o.d + @${RM} ${OBJECTDIR}/mcc_generated_files/tmr1.o + ${MP_CC} $(MP_EXTRA_CC_PRE) mcc_generated_files/tmr1.c -o ${OBJECTDIR}/mcc_generated_files/tmr1.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MP -MMD -MF "${OBJECTDIR}/mcc_generated_files/tmr1.o.d" -g -D__DEBUG -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16" + else ${OBJECTDIR}/mcc_generated_files/interrupt_manager.o: mcc_generated_files/interrupt_manager.c .generated_files/flags/default/60c7431cb00aac0333132f5c647f60453ea1e840 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709 @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @@ -210,6 +216,12 @@ ${OBJECTDIR}/SPI.o: SPI.c .generated_files/flags/default/270f3ff20fccff0b747990 @${RM} ${OBJECTDIR}/SPI.o ${MP_CC} $(MP_EXTRA_CC_PRE) SPI.c -o ${OBJECTDIR}/SPI.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MP -MMD -MF "${OBJECTDIR}/SPI.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16" +${OBJECTDIR}/mcc_generated_files/tmr1.o: mcc_generated_files/tmr1.c .generated_files/flags/default/4297c9472f1e68e5f2af2a9312fe6969293a79fe .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709 + @${MKDIR} "${OBJECTDIR}/mcc_generated_files" + @${RM} ${OBJECTDIR}/mcc_generated_files/tmr1.o.d + @${RM} ${OBJECTDIR}/mcc_generated_files/tmr1.o + ${MP_CC} $(MP_EXTRA_CC_PRE) mcc_generated_files/tmr1.c -o ${OBJECTDIR}/mcc_generated_files/tmr1.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MP -MMD -MF "${OBJECTDIR}/mcc_generated_files/tmr1.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp="${DFP_DIR}/xc16" + endif # ------------------------------------------------------------------------------------ diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index c077836..5e4103d 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,11 +1,11 @@ # -#Sun Mar 10 13:59:42 CDT 2024 +#Thu Mar 14 09:00:14 CDT 2024 default.languagetoolchain.version=2.10 default.Pack.dfplocation=/opt/microchip/mplabx/v6.15/packs/Microchip/PIC24F-KA-KL-KM_DFP/1.4.83 conf.ids=default default.languagetoolchain.dir=/opt/microchip/xc16/v2.10/bin host.id=2oqs-k23c-b5 -configurations-xml=8813fd3bc32c7d8cfcf5d0752129c2eb +configurations-xml=aa7ea78c1370f9c53ae3a0ed1a26fd29 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa proj.dir=/home/josh/MPLABXProjects/resbox.X default.com-microchip-mplab-mdbcore-pk4hybrid-Pk4HybridTooImpl.md5=38058ec39ea8224adcc766836376f0d6 diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 6dcfa92..947c630 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -15,6 +15,7 @@ mcc_generated_files/traps.h mcc_generated_files/system.h mcc_generated_files/mcc.h + mcc_generated_files/tmr1.h SPI.h @@ -36,6 +37,7 @@ mcc_generated_files/traps.c mcc_generated_files/mcc.c mcc_generated_files/mssp1_spi.c + mcc_generated_files/tmr1.c main.c SPI.c diff --git a/resbox.mc3 b/resbox.mc3 index 344a903..8372d88 100644 --- a/resbox.mc3 +++ b/resbox.mc3 @@ -37,6 +37,10 @@ System Module class com.microchip.mcc.mcu16.systemManager.DefaultSystemManagerMcu16 + + TMR1 + class com.microchip.mcc.mcu16.modules.tmr.TMR + WATCHDOG class com.microchip.mcc.mcu16.systemManager.wdt.Wdt @@ -5434,6 +5438,214 @@ OFF + + + disabled + + + + ISR_TMR1_TI + + + + 10000000 + + + + 1.5000064 + + + + 1.5000064 + + + + FOSC/2 + + + + 0 + + + + 58593 + + + + customTmrMode + + + + 10000000 + + + + 1.6777216 + + + + 0.0000512 + + + + 256 + + + + 39062.50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + + + + 1.5 + + + + 1 + + + + 16 Bit + + + + FALSE + + + + 65535 + + + + 0 + + + + 3 + + + + 2 + + + + 1 + + + + 1 + + + + 0 + + + + 2 + + + + 0 + + + + 1 + + + + 0 + + + + 1 + + + + 0 + + + + 1 + + + + 0 + + + + 1 + + + + 0 + + + + 1 + + + + 58593 + + + + 32816 + + + + 0 + + + + 58593 + + + + 1:256 + + + + FOSC/2 + + + + SOSC + + + + disabled + + + + enabled + + + + disabled + + + + disabled + + + + OFF + + + + enabled + + + + disabled + + + + 1 + + + + 0 + 31000 @@ -5464,38 +5676,46 @@ mcc_generated_files/pin_manager.h 080951689f95c4fc6350b1c256f03e85811ad476358298f6bd9507a53e443397 + + mcc_generated_files/tmr1.c + abb80bb4d96b79d150f5ffe5f6a7ce5d22e1677f7d8e6eaa365b04e5193a9fdd + mcc_generated_files/mssp1_spi.c 7d1e76be4f44e0c3033e4839463fd15c463956f0ac4eda99aaa104aaa5c079f9 + + mcc_generated_files/system.c + b8c2da52b3923af46bd8d6dcc1feef6a3e3bf6b52a29859e42180ab2a32d42ef + main.c 62990fd6c74361665b0487f7568abd48176fe4f567cce543690db2a436d03a07 - mcc_generated_files/system.c - f1ce360d9a65aac3ed5e8125fd5cb2fed2cf5b7c2ca00e74ac1869246ea11526 + mcc_generated_files/tmr1.h + 91624125bcff3c356fc988e1e58df48db056543108919b7d8719137be50c965f mcc_generated_files/mssp1_spi.h 6028633bb6a6513606b543b57eac40d4690f44ec6865eafa03aba9a6dedfaca6 - - mcc_generated_files/traps.h - 1b2e427e275d3221008b6176bdff465ef4ae43cdbacc3650ebfa64360d5e7780 - mcc_generated_files/clock.h 3d193f5928f2ec9cfcc6ad65b919ebcd72aa3fdf95637843efb6ac6949857aae - mcc_generated_files/traps.c - c7984bb4b7a599f4c99e44fc894a33a2dd98187ecab007be4d47056b24237362 + mcc_generated_files/traps.h + 1b2e427e275d3221008b6176bdff465ef4ae43cdbacc3650ebfa64360d5e7780 mcc_generated_files/clock.c 0cab06910a07845a0da3552256a704d1ec16f9ef27d26c5c2a1ba5dec11acd11 + + mcc_generated_files/traps.c + c7984bb4b7a599f4c99e44fc894a33a2dd98187ecab007be4d47056b24237362 + mcc_generated_files/mssp2_i2c.c 6e7ff380be6bfa8569ce806b04616f042f51a41c2e06f4c339035a06136ba6ed @@ -5506,7 +5726,7 @@ mcc_generated_files/mcc.h - da821ef996a6cff2ed80d33c9a57879210ca8d62a6dd2fd963a1877dc71a32fa + 1a2656005993f58131bc11eab9e2531d9b5906420afb3a6004e6fc273c27387c mcc_generated_files/system.h @@ -5514,7 +5734,7 @@ mcc_generated_files/interrupt_manager.c - 5aa7d6f716190716f932beb751109385a961c8bb543fb71f1895bb3d1ccd1610 + 2573e4437a3f520326772d81954754941c54d2d22996ef96e2bfeae062bbc345 mcc_generated_files/mcc.c -- cgit v1.2.3