removed the uneeded code for G2 and G3. Added function for instead using the Enable pins.
This commit is contained in:
jakeg00dwin
parent
0a2c8b1dab
commit
d084599429
12
TriacOut.c
12
TriacOut.c
|
|
@ -29,16 +29,16 @@ void TriacOut_InitTimerA(void)
|
|||
void TriacOut_SetupPins(void)
|
||||
{
|
||||
RegEdit_SetBit((void *) &PORTA.DIR, G1);
|
||||
RegEdit_SetBit((void *) &PORTB.DIR, G2);
|
||||
RegEdit_SetBit((void *) &PORTB.DIR, G3);
|
||||
//RegEdit_SetBit((void *) &PORTB.DIR, G2);
|
||||
//RegEdit_SetBit((void *) &PORTB.DIR, G3);
|
||||
}
|
||||
|
||||
|
||||
void TriacOut_SetAllHigh(void)
|
||||
{
|
||||
RegEdit_SetBit((void *) &PORTA.OUT, G1);
|
||||
RegEdit_SetBit((void *) &PORTB.OUT, G2);
|
||||
RegEdit_SetBit((void *) &PORTB.OUT, G3);
|
||||
//RegEdit_SetBit((void *) &PORTB.OUT, G2);
|
||||
//RegEdit_SetBit((void *) &PORTB.OUT, G3);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -48,8 +48,8 @@ void TriacOut_PulsePins(uint16_t pulse_time)
|
|||
Delay_MicroSeconds(pulse_time);
|
||||
|
||||
RegEdit_ClearBit((void *) &PORTA.OUT, G1);
|
||||
RegEdit_ClearBit((void *) &PORTB.OUT, G2);
|
||||
RegEdit_ClearBit((void *) &PORTB.OUT, G3);
|
||||
//RegEdit_ClearBit((void *) &PORTB.OUT, G2);
|
||||
//RegEdit_ClearBit((void *) &PORTB.OUT, G3);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
28
main.c
28
main.c
|
|
@ -9,11 +9,10 @@
|
|||
* extracted into separate source files and headers for configuration.
|
||||
*/
|
||||
|
||||
//#define F_CPU 2000000UL
|
||||
#define F_CPU 3333333UL
|
||||
|
||||
|
||||
//These defines are mostly useful for when you want you editors LSP server to
|
||||
//These defines are mostly useful for when you want your editors LSP server to
|
||||
//function correctly.
|
||||
//#ifndef __AVR_ATtiny404__
|
||||
//#define __AVR_ATtiny404__
|
||||
|
|
@ -36,27 +35,34 @@
|
|||
|
||||
//Set the function pointer for the delay func
|
||||
void (*Delay_MicroSeconds)(double us) = _delay_us;
|
||||
//void (*Delay_MicroSeconds)(double us) = _delay_ms;
|
||||
|
||||
static void CLK_DisablePrescaler(void)
|
||||
static void setEnablePinsHigh(void)
|
||||
{
|
||||
//CCP = CCP_IOREG_gc; /* Write the needed signature to CCP*/
|
||||
ccp_write_io((void *) & (CLKCTRL.MCLKCTRLA), 0x00); //select internal 20MHz clock.
|
||||
ccp_write_io((void *) & (CLKCTRL.MCLKCTRLB), 0x00); //Disable the pre-scaler.
|
||||
//Pins 12, 6 and 7 are all set high.
|
||||
PORTA.DIR |= (1<<2); //PA2= pin 12
|
||||
PORTB.DIR |= (1<<2)|(1<<3); //PB2 = pin 7, PB3 = pin 6
|
||||
|
||||
PORTA.OUT |= (1<<2);
|
||||
PORTB.OUT |= (1<<2)|(1<<3);
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
//CLK_DisablePrescaler();
|
||||
while(true){
|
||||
for(int i = 0; i < GatePulsesQty; i++){
|
||||
ZCD_Poll();
|
||||
_delay_us(Tau);
|
||||
TriacOut_SetupPins();
|
||||
TriacOut_SetAllHigh();
|
||||
TriacOut_SetAllHigh(); //Only G1 exists in High power mode
|
||||
TriacOut_PulsePins(GatePulses[i]);
|
||||
}
|
||||
|
||||
//The G1 pin is low at this point.
|
||||
_delay_ms(2500);
|
||||
ZCD_Poll();
|
||||
setEnablePinsHigh();
|
||||
while(true){
|
||||
; //Do nothing until new Power cycle/reset occurs
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN)
|
|||
IMAGE_TYPE=debug
|
||||
OUTPUT_SUFFIX=elf
|
||||
DEBUGGABLE_SUFFIX=elf
|
||||
FINAL_IMAGE=${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
FINAL_IMAGE=${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
else
|
||||
IMAGE_TYPE=production
|
||||
OUTPUT_SUFFIX=hex
|
||||
DEBUGGABLE_SUFFIX=elf
|
||||
FINAL_IMAGE=${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
FINAL_IMAGE=${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
endif
|
||||
|
||||
ifeq ($(COMPARE_BUILD), true)
|
||||
|
|
@ -82,80 +82,80 @@ FIXDEPS=fixDeps
|
|||
ifneq ($(INFORMATION_MESSAGE), )
|
||||
@echo $(INFORMATION_MESSAGE)
|
||||
endif
|
||||
${MAKE} -f nbproject/Makefile-attiny404.mk ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
${MAKE} -f nbproject/Makefile-attiny404.mk ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
|
||||
|
||||
MP_PROCESSOR_OPTION=ATtiny404
|
||||
# ------------------------------------------------------------------------------------
|
||||
# Rules for buildStep: compile
|
||||
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
|
||||
${OBJECTDIR}/main.o: main.c .generated_files/flags/attiny404/6761bf7248a4cadeb46b4b39803ff87499996ec1 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/main.o: main.c .generated_files/flags/attiny404/1d48c8c80be43b90a1c08fae6400d41ee9ff55e9 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/main.o.d
|
||||
@${RM} ${OBJECTDIR}/main.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/main.o.d" -MT "${OBJECTDIR}/main.o.d" -MT ${OBJECTDIR}/main.o -o ${OBJECTDIR}/main.o main.c
|
||||
|
||||
${OBJECTDIR}/ADC.o: ADC.c .generated_files/flags/attiny404/c45596993967974bbfbe169a719e0e0d21ff893d .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/ADC.o: ADC.c .generated_files/flags/attiny404/fe9fe9dc431eccd2788621f6d36a6217356c3290 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/ADC.o.d
|
||||
@${RM} ${OBJECTDIR}/ADC.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/ADC.o.d" -MT "${OBJECTDIR}/ADC.o.d" -MT ${OBJECTDIR}/ADC.o -o ${OBJECTDIR}/ADC.o ADC.c
|
||||
|
||||
${OBJECTDIR}/RegEdit.o: RegEdit.c .generated_files/flags/attiny404/cc64545d113e2f1b3161faab1858be38ecc1741c .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/RegEdit.o: RegEdit.c .generated_files/flags/attiny404/28f2a6dfcb0bf9771c6538758236a03d702b118c .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/RegEdit.o.d
|
||||
@${RM} ${OBJECTDIR}/RegEdit.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/RegEdit.o.d" -MT "${OBJECTDIR}/RegEdit.o.d" -MT ${OBJECTDIR}/RegEdit.o -o ${OBJECTDIR}/RegEdit.o RegEdit.c
|
||||
|
||||
${OBJECTDIR}/TriacOut.o: TriacOut.c .generated_files/flags/attiny404/4c8eafab5895fc430ca2d69acdfc255c5b836dc6 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/TriacOut.o: TriacOut.c .generated_files/flags/attiny404/cbedb2c49169012df87fb86beea7d4807e39dc20 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/TriacOut.o.d
|
||||
@${RM} ${OBJECTDIR}/TriacOut.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/TriacOut.o.d" -MT "${OBJECTDIR}/TriacOut.o.d" -MT ${OBJECTDIR}/TriacOut.o -o ${OBJECTDIR}/TriacOut.o TriacOut.c
|
||||
|
||||
${OBJECTDIR}/zero_cross_detection.o: zero_cross_detection.c .generated_files/flags/attiny404/cf405395db1973f98ef024eb38deac77e84906a6 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/zero_cross_detection.o: zero_cross_detection.c .generated_files/flags/attiny404/d505156a7dcbe35caa540f9a8ea6e76def5ad3be .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/zero_cross_detection.o.d
|
||||
@${RM} ${OBJECTDIR}/zero_cross_detection.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/zero_cross_detection.o.d" -MT "${OBJECTDIR}/zero_cross_detection.o.d" -MT ${OBJECTDIR}/zero_cross_detection.o -o ${OBJECTDIR}/zero_cross_detection.o zero_cross_detection.c
|
||||
|
||||
${OBJECTDIR}/load.o: load.c .generated_files/flags/attiny404/74e65e7358e6d6fd8bba20823ce6e6935042de9c .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/load.o: load.c .generated_files/flags/attiny404/dbb3ed1b5e0192f11fc698cff7fe3b009524b651 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/load.o.d
|
||||
@${RM} ${OBJECTDIR}/load.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/load.o.d" -MT "${OBJECTDIR}/load.o.d" -MT ${OBJECTDIR}/load.o -o ${OBJECTDIR}/load.o load.c
|
||||
|
||||
else
|
||||
${OBJECTDIR}/main.o: main.c .generated_files/flags/attiny404/d99de9a28e9c79c808fb24e0bb97338639ea58e9 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/main.o: main.c .generated_files/flags/attiny404/cce9a5e3cc613fb8301c46a6ad3c93a2bf249ae6 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/main.o.d
|
||||
@${RM} ${OBJECTDIR}/main.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/main.o.d" -MT "${OBJECTDIR}/main.o.d" -MT ${OBJECTDIR}/main.o -o ${OBJECTDIR}/main.o main.c
|
||||
|
||||
${OBJECTDIR}/ADC.o: ADC.c .generated_files/flags/attiny404/6c5aa0ea82b90e42a6a5991863c4d1c15ec6df24 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/ADC.o: ADC.c .generated_files/flags/attiny404/bad92954d32267494953a32166e43ff6ec4b362b .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/ADC.o.d
|
||||
@${RM} ${OBJECTDIR}/ADC.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/ADC.o.d" -MT "${OBJECTDIR}/ADC.o.d" -MT ${OBJECTDIR}/ADC.o -o ${OBJECTDIR}/ADC.o ADC.c
|
||||
|
||||
${OBJECTDIR}/RegEdit.o: RegEdit.c .generated_files/flags/attiny404/8bc989d0d13be0680224accf1044bba9c13e9e06 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/RegEdit.o: RegEdit.c .generated_files/flags/attiny404/b996d8ce29ae588ec02579dffd7de0a5380f3b3e .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/RegEdit.o.d
|
||||
@${RM} ${OBJECTDIR}/RegEdit.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/RegEdit.o.d" -MT "${OBJECTDIR}/RegEdit.o.d" -MT ${OBJECTDIR}/RegEdit.o -o ${OBJECTDIR}/RegEdit.o RegEdit.c
|
||||
|
||||
${OBJECTDIR}/TriacOut.o: TriacOut.c .generated_files/flags/attiny404/d40fe8acfb56f046a02d783cde612a50adad018d .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/TriacOut.o: TriacOut.c .generated_files/flags/attiny404/70ad3cf6b9392caaea19699d68b2d416f27dd901 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/TriacOut.o.d
|
||||
@${RM} ${OBJECTDIR}/TriacOut.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/TriacOut.o.d" -MT "${OBJECTDIR}/TriacOut.o.d" -MT ${OBJECTDIR}/TriacOut.o -o ${OBJECTDIR}/TriacOut.o TriacOut.c
|
||||
|
||||
${OBJECTDIR}/zero_cross_detection.o: zero_cross_detection.c .generated_files/flags/attiny404/4ee41962ee462e1b43db78ddddd0ee1a7619a9fa .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/zero_cross_detection.o: zero_cross_detection.c .generated_files/flags/attiny404/5d97c5267af165ce3dc277e265b0185d1683961 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/zero_cross_detection.o.d
|
||||
@${RM} ${OBJECTDIR}/zero_cross_detection.o
|
||||
${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_attiny404=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -mno-const-data-in-progmem -MD -MP -MF "${OBJECTDIR}/zero_cross_detection.o.d" -MT "${OBJECTDIR}/zero_cross_detection.o.d" -MT ${OBJECTDIR}/zero_cross_detection.o -o ${OBJECTDIR}/zero_cross_detection.o zero_cross_detection.c
|
||||
|
||||
${OBJECTDIR}/load.o: load.c .generated_files/flags/attiny404/ed741808f7f01207d533233eede6370ae89b6d03 .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
${OBJECTDIR}/load.o: load.c .generated_files/flags/attiny404/414caa6d53ccf6bd6a6a12f60db96a6b56d5f5ba .generated_files/flags/attiny404/da39a3ee5e6b4b0d3255bfef95601890afd80709
|
||||
@${MKDIR} "${OBJECTDIR}"
|
||||
@${RM} ${OBJECTDIR}/load.o.d
|
||||
@${RM} ${OBJECTDIR}/load.o
|
||||
|
|
@ -178,17 +178,17 @@ endif
|
|||
# ------------------------------------------------------------------------------------
|
||||
# Rules for buildStep: link
|
||||
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
|
||||
${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
|
||||
${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
|
||||
@${MKDIR} ${DISTDIR}
|
||||
${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.map -D__DEBUG=1 -DXPRJ_attiny404=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -gdwarf-2 -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 -mno-const-data-in-progmem $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1
|
||||
@${RM} ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.hex
|
||||
${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.map -D__DEBUG=1 -DXPRJ_attiny404=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -gdwarf-2 -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 -mno-const-data-in-progmem $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1
|
||||
@${RM} ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.hex
|
||||
|
||||
|
||||
else
|
||||
${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
|
||||
${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
|
||||
@${MKDIR} ${DISTDIR}
|
||||
${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.map -DXPRJ_attiny404=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 -mno-const-data-in-progmem $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group
|
||||
${MP_CC_DIR}/avr-objcopy -O ihex "${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}" "${DISTDIR}/fg004a_test.X.${IMAGE_TYPE}.hex"
|
||||
${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.map -DXPRJ_attiny404=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 -mno-const-data-in-progmem $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group
|
||||
${MP_CC_DIR}/avr-objcopy -O ihex "${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}" "${DISTDIR}/fg004a_high_power.X.${IMAGE_TYPE}.hex"
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
#Wed Jul 10 08:03:09 PDT 2024
|
||||
#Sat Jul 20 10:18:22 PDT 2024
|
||||
attiny404.languagetoolchain.version=2.46
|
||||
attiny404.com-microchip-mplab-nbide-toolchain-xc8-XC8LanguageToolchain.md5=bf89cdcdd6c0a49174fe4b605ef2b42d
|
||||
conf.ids=,attiny404
|
||||
|
|
@ -8,6 +8,6 @@ configurations-xml=a2902459fa41badc4b7c9fbc5e9c3988
|
|||
attiny404.platformTool.md5=null
|
||||
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=f612087c95360c842296d189edfe3321
|
||||
attiny404.languagetoolchain.dir=/opt/microchip/xc8/v2.46/bin
|
||||
proj.dir=/home/ronin/Documents/projects/freelance/laith_naaman/fg004a_test.X
|
||||
proj.dir=/home/ronin/Documents/projects/freelance/laith_naaman/fg004a_high_power.X
|
||||
attiny404.Pack.dfplocation=/opt/microchip/mplabx/v6.20/packs/Microchip/ATtiny_DFP/3.1.260
|
||||
host.platform=linux
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
|
|||
|
||||
|
||||
# Project Name
|
||||
PROJECTNAME=fg004a_test.X
|
||||
PROJECTNAME=fg004a_high_power.X
|
||||
|
||||
# Active Configuration
|
||||
DEFAULTCONF=attiny404
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
CND_BASEDIR=`pwd`
|
||||
# default configuration
|
||||
CND_ARTIFACT_DIR_default=dist/default/production
|
||||
CND_ARTIFACT_NAME_default=fg004a_test.X.production.hex
|
||||
CND_ARTIFACT_PATH_default=dist/default/production/fg004a_test.X.production.hex
|
||||
CND_ARTIFACT_NAME_default=fg004a_high_power.X.production.hex
|
||||
CND_ARTIFACT_PATH_default=dist/default/production/fg004a_high_power.X.production.hex
|
||||
# attiny404 configuration
|
||||
CND_ARTIFACT_DIR_attiny404=dist/attiny404/production
|
||||
CND_ARTIFACT_NAME_attiny404=fg004a_test.X.production.hex
|
||||
CND_ARTIFACT_PATH_attiny404=dist/attiny404/production/fg004a_test.X.production.hex
|
||||
CND_ARTIFACT_NAME_attiny404=fg004a_high_power.X.production.hex
|
||||
CND_ARTIFACT_PATH_attiny404=dist/attiny404/production/fg004a_high_power.X.production.hex
|
||||
|
|
|
|||
Loading…
Reference in New Issue