From bbcdff189bdb53bccc968032c5cc010f25c24f1c Mon Sep 17 00:00:00 2001 From: Wessel Tip Date: Wed, 6 Mar 2024 10:08:11 +0100 Subject: [PATCH] feat: finalize --- .../nbproject/Makefile-genesis.properties | 4 ++-- picamp-potentiometer.X/picamp-potentiometer.c | 6 ------ picamp-rotary.X/nbproject/Makefile-genesis.properties | 4 ++-- picamp-rotary.X/picamp-rotary.c | 11 ++++++++++- picamp.X/nbproject/Makefile-genesis.properties | 6 +++--- picamp.X/nbproject/configurations.xml | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/picamp-potentiometer.X/nbproject/Makefile-genesis.properties b/picamp-potentiometer.X/nbproject/Makefile-genesis.properties index 9601cab..d9b1b0b 100644 --- a/picamp-potentiometer.X/nbproject/Makefile-genesis.properties +++ b/picamp-potentiometer.X/nbproject/Makefile-genesis.properties @@ -1,10 +1,10 @@ # -#Wed Feb 28 13:23:10 CET 2024 +#Mon Mar 04 10:05:06 CET 2024 default.languagetoolchain.version=2.45 default.Pack.dfplocation=C\:\\Program Files\\Microchip\\MPLABX\\v6.15\\packs\\Microchip\\PIC16Fxxx_DFP\\1.4.149 conf.ids=default default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc8\\v2.45\\bin -host.id=2cdp-lqgb-i2 +host.id=pp86-uyg1-e default.platformTool.md5=null configurations-xml=ef0dab023007462dba333f99adb47e89 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa diff --git a/picamp-potentiometer.X/picamp-potentiometer.c b/picamp-potentiometer.X/picamp-potentiometer.c index a734e2b..761da2b 100644 --- a/picamp-potentiometer.X/picamp-potentiometer.c +++ b/picamp-potentiometer.X/picamp-potentiometer.c @@ -75,12 +75,6 @@ void __init_adc(ADCChannelSelect analogPin) { } } -#else -int __get_pod_data(void) { - return 0; -} - -void __init_adc(ADCChannelSelect analogPin) {} #endif /** @brief Initialize the potentiometer diff --git a/picamp-rotary.X/nbproject/Makefile-genesis.properties b/picamp-rotary.X/nbproject/Makefile-genesis.properties index be0e112..a15c60a 100644 --- a/picamp-rotary.X/nbproject/Makefile-genesis.properties +++ b/picamp-rotary.X/nbproject/Makefile-genesis.properties @@ -1,10 +1,10 @@ # -#Wed Feb 28 12:23:58 CET 2024 +#Mon Mar 04 10:05:10 CET 2024 default.languagetoolchain.version=2.45 default.Pack.dfplocation=C\:\\Program Files\\Microchip\\MPLABX\\v6.15\\packs\\Microchip\\PIC16Fxxx_DFP\\1.4.149 conf.ids=default default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc8\\v2.45\\bin -host.id=2cdp-lqgb-i2 +host.id=pp86-uyg1-e default.platformTool.md5=null configurations-xml=43b07172340b3eaea269a3aff96aed06 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa diff --git a/picamp-rotary.X/picamp-rotary.c b/picamp-rotary.X/picamp-rotary.c index faa8e66..1c8e882 100644 --- a/picamp-rotary.X/picamp-rotary.c +++ b/picamp-rotary.X/picamp-rotary.c @@ -38,7 +38,16 @@ void __init_pin(volatile unsigned char* trisA, volatile unsigned char* trisB) { } #elif PIC1829 void __init_int(void) {} -void __init_pin(volatile unsigned char* trisA, volatile unsigned char* trisB) {} +void __init_pin(volatile unsigned char* trisA, volatile unsigned char* trisB) { + // Set `trisA` and `trisB` as inputs + *trisA = 1; + *trisB = 1; + + // Set all channels to digital + ANSELA = 0; + ANSELB = 0; + ANSELC = 0; +} #endif /** @brief Initialize the rotary encoder diff --git a/picamp.X/nbproject/Makefile-genesis.properties b/picamp.X/nbproject/Makefile-genesis.properties index 1b8085e..725b58c 100644 --- a/picamp.X/nbproject/Makefile-genesis.properties +++ b/picamp.X/nbproject/Makefile-genesis.properties @@ -1,12 +1,12 @@ # -#Wed Feb 28 13:23:10 CET 2024 +#Mon Mar 04 10:23:40 CET 2024 default.languagetoolchain.version=2.45 default.Pack.dfplocation=C\:\\Program Files\\Microchip\\MPLABX\\v6.15\\packs\\Microchip\\PIC16Fxxx_DFP\\1.4.149 default.com-microchip-mplab-mdbcore-PK5Tool-PK5ToolImpl.md5=723771b957e0f1e0ec1761a42d8bb5e8 conf.ids=default default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc8\\v2.45\\bin -host.id=2cdp-lqgb-i2 -configurations-xml=c861feb090de947459c679f9ae7c7984 +host.id=pp86-uyg1-e +configurations-xml=c900431f81c44a9b6a444850fdc0f22a com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa default.com-microchip-mplab-nbide-toolchain-xc8-XC8LanguageToolchain.md5=486b02ed36e5bdffb1f797e38fa058e5 proj.dir=C\:\\Users\\wesse\\Downloads\\picamp-old\\picamp.X diff --git a/picamp.X/nbproject/configurations.xml b/picamp.X/nbproject/configurations.xml index 93e2402..dfe2d12 100644 --- a/picamp.X/nbproject/configurations.xml +++ b/picamp.X/nbproject/configurations.xml @@ -225,7 +225,7 @@ + value="C:/Users/wesse/Downloads/picamp/debug/default/default_ptg"/>