Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Portable/WizC Formatting #888

Merged
merged 7 commits into from
Nov 23, 2023
Merged

Revert Portable/WizC Formatting #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c86832
Revert formatting on WizC ports
Skptak Nov 8, 2023
8f0f655
Fix spelling mistakes
Skptak Nov 8, 2023
4bd22d3
Merge branch 'main' into fixWizCFormatting
Skptak Nov 9, 2023
1fbb61e
Merge branch 'main' into fixWizCFormatting
Skptak Nov 16, 2023
e02c665
Merge branch 'main' into fixWizCFormatting
kar-rahul-aws Nov 20, 2023
531f83e
Merge branch 'main' into fixWizCFormatting
kar-rahul-aws Nov 23, 2023
0ec75a0
Merge branch 'main' into fixWizCFormatting
aggarg Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions portable/WizC/PIC18/Drivers/Tick/Tick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,50 @@
*/

/*
* Changes from V3.0.0
+ ISRcode is pulled inline and portTICKisr() is therefore
+ deleted from this file.
+
+ Prescaler logic for Timer1 added to allow for a wider
+ range of TickRates.
+
+ Changes from V3.0.1
*/
Changes from V3.0.0
+ ISRcode is pulled inline and portTICKisr() is therefore
deleted from this file.

+ Prescaler logic for Timer1 added to allow for a wider
range of TickRates.

Changes from V3.0.1
*/

#include <FreeRTOS.h>
#include <task.h>

/* IO port constants. */
#define portBIT_SET ( 1 )
#define portBIT_CLEAR ( 0 )
#define portBIT_SET (1)
#define portBIT_CLEAR (0)

/*
* Hardware setup for the tick.
* We use a compare match on timer1. Depending on MPU-frequency
* and requested tickrate, a prescaled value with a matching
* prescaler are determined.
*/
#define portTIMER_COMPARE_BASE ( ( APROCFREQ / 4 ) / configTICK_RATE_HZ )
#define portTIMER_COMPARE_BASE ((APROCFREQ/4)/configTICK_RATE_HZ)

#if portTIMER_COMPARE_BASE < 0x10000
#define portTIMER_COMPARE_VALUE ( portTIMER_COMPARE_BASE )
#define portTIMER_COMPARE_PS1 ( portBIT_CLEAR )
#define portTIMER_COMPARE_PS0 ( portBIT_CLEAR )
#if portTIMER_COMPARE_BASE < 0x10000
#define portTIMER_COMPARE_VALUE (portTIMER_COMPARE_BASE)
#define portTIMER_COMPARE_PS1 (portBIT_CLEAR)
#define portTIMER_COMPARE_PS0 (portBIT_CLEAR)
#elif portTIMER_COMPARE_BASE < 0x20000
#define portTIMER_COMPARE_VALUE ( portTIMER_COMPARE_BASE / 2 )
#define portTIMER_COMPARE_PS1 ( portBIT_CLEAR )
#define portTIMER_COMPARE_PS0 ( portBIT_SET )
#define portTIMER_COMPARE_VALUE (portTIMER_COMPARE_BASE / 2)
#define portTIMER_COMPARE_PS1 (portBIT_CLEAR)
#define portTIMER_COMPARE_PS0 (portBIT_SET)
#elif portTIMER_COMPARE_BASE < 0x40000
#define portTIMER_COMPARE_VALUE ( portTIMER_COMPARE_BASE / 4 )
#define portTIMER_COMPARE_PS1 ( portBIT_SET )
#define portTIMER_COMPARE_PS0 ( portBIT_CLEAR )
#define portTIMER_COMPARE_VALUE (portTIMER_COMPARE_BASE / 4)
#define portTIMER_COMPARE_PS1 (portBIT_SET)
#define portTIMER_COMPARE_PS0 (portBIT_CLEAR)
#elif portTIMER_COMPARE_BASE < 0x80000
#define portTIMER_COMPARE_VALUE ( portTIMER_COMPARE_BASE / 8 )
#define portTIMER_COMPARE_PS1 ( portBIT_SET )
#define portTIMER_COMPARE_PS0 ( portBIT_SET )
#else /* if portTIMER_COMPARE_BASE < 0x10000 */
#define portTIMER_COMPARE_VALUE (portTIMER_COMPARE_BASE / 8)
#define portTIMER_COMPARE_PS1 (portBIT_SET)
#define portTIMER_COMPARE_PS0 (portBIT_SET)
#else
#error "TickRate out of range"
#endif /* if portTIMER_COMPARE_BASE < 0x10000 */
#endif

/*-----------------------------------------------------------*/

Expand All @@ -92,27 +92,27 @@ void portSetupTick( void )
* Set the compare match value.
*/
CCPR1H = ( uint8_t ) ( ( portTIMER_COMPARE_VALUE >> 8 ) & 0xff );
CCPR1L = ( uint8_t ) ( portTIMER_COMPARE_VALUE & 0xff );
CCPR1L = ( uint8_t ) ( portTIMER_COMPARE_VALUE & 0xff );

/*
* Set Compare Special Event Trigger Mode
*/
bCCP1M3 = portBIT_SET;
bCCP1M2 = portBIT_CLEAR;
bCCP1M1 = portBIT_SET;
bCCP1M0 = portBIT_SET;
bCCP1M3 = portBIT_SET;
bCCP1M2 = portBIT_CLEAR;
bCCP1M1 = portBIT_SET;
bCCP1M0 = portBIT_SET;

/*
* Enable CCP1 interrupt
*/
bCCP1IE = portBIT_SET;
bCCP1IE = portBIT_SET;

/*
* We are only going to use the global interrupt bit, so disable
* interruptpriorities and enable peripheral interrupts.
*/
bIPEN = portBIT_CLEAR;
bPEIE = portBIT_SET;
bIPEN = portBIT_CLEAR;
bPEIE = portBIT_SET;

/*
* Set up timer1
Expand All @@ -128,12 +128,12 @@ void portSetupTick( void )
/*
* Setup the timer
*/
bRD16 = portBIT_SET; /* 16-bit */
bT1CKPS1 = portTIMER_COMPARE_PS1; /* prescaler */
bT1CKPS0 = portTIMER_COMPARE_PS0; /* prescaler */
bT1OSCEN = portBIT_SET; /* Oscillator enable */
bT1SYNC = portBIT_SET; /* No external clock sync */
bTMR1CS = portBIT_CLEAR; /* Internal clock */

bTMR1ON = portBIT_SET; /* Start timer1 */
bRD16 = portBIT_SET; // 16-bit
bT1CKPS1 = portTIMER_COMPARE_PS1; // prescaler
bT1CKPS0 = portTIMER_COMPARE_PS0; // prescaler
bT1OSCEN = portBIT_SET; // Oscillator enable
bT1SYNC = portBIT_SET; // No external clock sync
bTMR1CS = portBIT_CLEAR; // Internal clock

bTMR1ON = portBIT_SET; // Start timer1
}
24 changes: 12 additions & 12 deletions portable/WizC/PIC18/Drivers/Tick/isrTick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
*/

/*
* Changes from V3.0.0
+ ISRcode pulled inline to reduce stack-usage.
+
+ Added functionality to only call vTaskSwitchContext() once
+ when handling multiple interruptsources in a single interruptcall.
+
+ Filename changed to a .c extension to allow stepping through code
+ using F7.
+
+ Changes from V3.0.1
*/
Changes from V3.0.0
+ ISRcode pulled inline to reduce stack-usage.

+ Added functionality to only call vTaskSwitchContext() once
when handling multiple interruptsources in a single interruptcall.

+ Filename changed to a .c extension to allow stepping through code
using F7.

Changes from V3.0.1
*/

/*
* ISR for the tick.
Expand Down Expand Up @@ -76,4 +76,4 @@

#pragma wizcpp uselib "$__PATHNAME__/Tick.c"

#endif /* _FREERTOS_DRIVERS_TICK_ISRTICK_C */
#endif /* _FREERTOS_DRIVERS_TICK_ISRTICK_C */
16 changes: 8 additions & 8 deletions portable/WizC/PIC18/addFreeRTOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
*/

/*
* Changes from V3.0.0
*
* Changes from V3.0.1
*
* Changes from V4.0.1
* Uselib pragma added for Croutine.c
*/
Changes from V3.0.0

Changes from V3.0.1

Changes from V4.0.1
Uselib pragma added for Croutine.c
*/

/*
* The installation script will automatically prepend this file to the default FreeRTOS.h.
Expand All @@ -51,4 +51,4 @@
#pragma wizcpp uselib "$__PATHNAME__/libFreeRTOS/Modules/List.c"
#pragma wizcpp uselib "$__PATHNAME__/libFreeRTOS/Modules/Port.c"

#endif /* WIZC_FREERTOS_H */
#endif /* WIZC_FREERTOS_H */
Loading
Loading