From 94817bdb8ae24501ed449f57dd47dd5622ac9342 Mon Sep 17 00:00:00 2001 From: jakeg00dwin Date: Tue, 2 Jul 2024 08:45:19 -0700 Subject: [PATCH] updated the git config --- main.c | 98 ++++++++++++------------ nbproject/Makefile-genesis.properties | 17 ++--- nbproject/configurations.xml | 103 -------------------------- nbproject/private/private.xml | 19 ++--- nbproject/project.xml | 50 ++++++------- 5 files changed, 90 insertions(+), 197 deletions(-) diff --git a/main.c b/main.c index 10ac6dc..681bfbb 100644 --- a/main.c +++ b/main.c @@ -1,49 +1,49 @@ -/** - * @file main.c - * @author Jake G - * @date 15 June 2024 - * @brief File contains the main function. - * - * This file contains the main logic loop and exists to setup the values - * specific to the micro-controller. All other functions and configuration are - * extracted into separate source files and headers for configuration. - */ - -#define F_CPU 2000000UL - -//These defines are mostly useful for when you want you editors LSP server to -//function correctly. -//#ifndef __AVR_ATtiny404__ -//#define __AVR_ATtiny404__ -//#endif - -//This can prevent issues with utils/delay.h library with the gcc toolchain -#define __DELAY_BACKWARD_COMPATIBLE__ - -#include "config.h" -#include "RegEdit.h" -#include "zero_cross_detection.h" -#include "ADC.h" -#include "TriacOut.h" -#include -#include - - - -//Set the function pointer for the delay func -void (*Delay_MicroSeconds)(double us) = _delay_us; -//void (*Delay_MicroSeconds)(double us) = _delay_ms; - -int main(int argc, char **argv) -{ - while(true){ - for(int i = 0; i < GatePulsesQty; i++){ - ZCD_Poll(); - _delay_us(Tau); - TriacOut_SetupPins(); - TriacOut_SetAllHigh(); - TriacOut_PulsePins(GatePulses[i]); - } - } -} - +/** + * @file main.c + * @author Jake G + * @date 15 June 2024 + * @brief File contains the main function. + * + * This file contains the main logic loop and exists to setup the values + * specific to the micro-controller. All other functions and configuration are + * extracted into separate source files and headers for configuration. + */ + +#define F_CPU 2000000UL + +//These defines are mostly useful for when you want you editors LSP server to +//function correctly. +//#ifndef __AVR_ATtiny404__ +//#define __AVR_ATtiny404__ +//#endif + +//This can prevent issues with utils/delay.h library with the gcc toolchain +#define __DELAY_BACKWARD_COMPATIBLE__ + +#include "config.h" +#include "RegEdit.h" +#include "zero_cross_detection.h" +#include "ADC.h" +#include "TriacOut.h" +#include +#include + + + +//Set the function pointer for the delay func +void (*Delay_MicroSeconds)(double us) = _delay_us; +//void (*Delay_MicroSeconds)(double us) = _delay_ms; + +int main(int argc, char **argv) +{ + while(true){ + for(int i = 0; i < GatePulsesQty; i++){ + ZCD_Poll(); + _delay_us(Tau); + TriacOut_SetupPins(); + TriacOut_SetAllHigh(); + TriacOut_PulsePins(GatePulses[i]); + } + } +} + diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index 418cd10..63c993b 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,13 +1,8 @@ # -#Mon Jul 01 17:42:53 PDT 2024 -default.languagetoolchain.version=1.00 -default.Pack.dfplocation=C\:\\Program Files\\Microchip\\MPLABX\\v6.20\\packs\\Microchip\\ATtiny_DFP\\3.1.260 -default.com-microchip-mplab-nbide-toolchain-avr-AVRLanguageToolchain.md5=d2326bf6869b96f43e381b4466c214be -conf.ids=default -default.languagetoolchain.dir=C\:\\Program Files\\avr-gcc\\bin -host.id=j1ll-lx4o-q -default.platformTool.md5=null -configurations-xml=1558a6e2a726c6c3f94e84f48431d94a +#Tue Jul 02 08:44:53 PDT 2024 +proj.dir=/home/ronin/Documents/projects/freelance/laith_naaman/fg004a.X +host.id=2ov5-ff4p-rv +configurations-xml=dfce056fe36aa3735f488e4376d653a6 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=f612087c95360c842296d189edfe3321 -proj.dir=C\:\\Users\\Lenovo\\MPLABXProjects\\fg004a.X -host.platform=windows +host.platform=linux +conf.ids= diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 8055665..fdc8aba 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -175,87 +175,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -386,28 +305,6 @@ value="Press to select which tool pack to use"/> - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index c3df004..9d22a64 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,9 +1,10 @@ - - - - - - file:/C:/Users/Lenovo/MPLABXProjects/fg004a.X/main.c - - - + + + + + + file:/home/ronin/Documents/projects/freelance/laith_naaman/fg004a.X/main.c + file:/home/ronin/Documents/projects/freelance/laith_naaman/fg004a.X/.git/config + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index f17c18c..dcb360d 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,25 +1,25 @@ - - - com.microchip.mplab.nbide.embedded.makeproject - - - fg004a - 428c0aa9-0d58-40bd-97a0-d26a5305fcb1 - 0 - UTF-8 - - - . - - - - default - 2 - - - - false - - - - + + + com.microchip.mplab.nbide.embedded.makeproject + + + fg004a + 428c0aa9-0d58-40bd-97a0-d26a5305fcb1 + 0 + UTF-8 + + + . + + + + default + 2 + + + + false + + + +