Added Blinking and Serial Thread

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10586 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
edolomb 2017-09-14 14:37:03 +00:00
parent f88467025f
commit f8fe78d5ec
6 changed files with 99 additions and 63 deletions

View File

@ -79,12 +79,12 @@
<link> <link>
<name>board</name> <name>board</name>
<type>2</type> <type>2</type>
<locationURI>CHIBIOS/os/hal/boards/ATSAMA5D2_XULT</locationURI> <location>/home/chibi/Chibilogic/ChibiOS_trunk/os/hal/boards/ATSAMA5D2_XULT</location>
</link> </link>
<link> <link>
<name>os</name> <name>os</name>
<type>2</type> <type>2</type>
<locationURI>CHIBIOS/os</locationURI> <location>/home/chibi/Chibilogic/ChibiOS_trunk/os</location>
</link> </link>
</linkedResources> </linkedResources>
</projectDescription> </projectDescription>

View File

@ -137,6 +137,7 @@ CSRC = $(STARTUPSRC) \
$(PLATFORMSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \ $(BOARDSRC) \
$(TESTSRC) \ $(TESTSRC) \
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
main.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -170,7 +171,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(CHIBIOS)/os/license \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
# #
# Project, sources and paths # Project, sources and paths

View File

@ -49,4 +49,6 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#10;"/>
<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
</launchConfiguration> </launchConfiguration>

View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL subsystem. * @brief Enables the SERIAL subsystem.
*/ */
#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL FALSE #define HAL_USE_SERIAL TRUE
#endif #endif
/** /**

View File

@ -16,9 +16,9 @@
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "chprintf.h"
static uint32_t seconds_counter; #define AICREDIR_KEY 0x5B6C0E26u
static uint32_t minutes_counter;
/* /*
* Seconds counter thread. * Seconds counter thread.
@ -27,12 +27,21 @@ static THD_WORKING_AREA(waThread1, 128);
static THD_FUNCTION(Thread1, arg) { static THD_FUNCTION(Thread1, arg) {
(void)arg; (void)arg;
bool ld = true;
chRegSetThreadName("counter"); chRegSetThreadName("counter");
while (true) { while (true) {
/* TODO: Replace with toggle function of GPIO */
if(ld){
PIOA->PIO_PIO_[1].S_PIO_CODR = S_PIO_CODR_P5;
ld = false;
}
else{
PIOA->PIO_PIO_[1].S_PIO_SODR = S_PIO_SODR_P5;
ld = true;
}
chprintf((BaseSequentialStream *)&SD0, "ChibiOS is running!\r\n\n");
chThdSleepMilliseconds(1000); chThdSleepMilliseconds(1000);
seconds_counter++;
} }
} }
@ -51,6 +60,31 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
/* Redirect interrupts */
uint32_t aicredir = SFR_AICREDIR_AICREDIRKEY((uint32_t)(AICREDIR_KEY));
SFR->SFR_AICREDIR = (aicredir ^ SFR->SFR_SN1);
/*
* TODO: Replace with PAL functions
* Led green
*/
PIOA->PIO_PIO_[1].S_PIO_SIOSR |= S_PIO_SIOSR_P5;
PIOA->PIO_PIO_[1].S_PIO_MSKR = S_PIO_MSKR_MSK5_ENABLED;
PIOA->PIO_PIO_[1].S_PIO_CFGR = S_PIO_CFGR_DIR_OUTPUT;
PIOA->PIO_PIO_[1].S_PIO_SODR = S_PIO_SODR_P5 ;
/*
* TODO: Replace with PAL functions
* Uart0 pins PB26 rx and PB27 tx (J18)
*/
PIOA->PIO_PIO_[1].S_PIO_SIOSR |= S_PIO_SIOSR_P26 | S_PIO_SIOSR_P27;
/* select pins */
PIOA->PIO_PIO_[1].S_PIO_MSKR = S_PIO_MSKR_MSK26 | S_PIO_MSKR_MSK27;
/* pins are driven by func_periph_c (uart0 mode) */
PIOA->PIO_PIO_[1].S_PIO_CFGR = S_PIO_CFGR_FUNC_PERIPH_C;
sdStart(&SD0, NULL);
/* /*
* Creates the example thread. * Creates the example thread.
*/ */
@ -61,7 +95,6 @@ int main(void) {
* increasing the minutes counter. * increasing the minutes counter.
*/ */
while (true) { while (true) {
chThdSleepSeconds(60); chThdSleepMilliseconds(500);
minutes_counter++;
} }
} }

View File

@ -46,7 +46,7 @@
/* /*
* SERIAL driver system settings. * SERIAL driver system settings.
*/ */
#define SAMA_SERIAL_USE_UART0 FALSE #define SAMA_SERIAL_USE_UART0 TRUE
#define SAMA_SERIAL_USE_UART1 FALSE #define SAMA_SERIAL_USE_UART1 FALSE
#define SAMA_SERIAL_USE_UART2 FALSE #define SAMA_SERIAL_USE_UART2 FALSE
#define SAMA_SERIAL_USE_UART3 FALSE #define SAMA_SERIAL_USE_UART3 FALSE