10000 Update to the newest murasaki. · suikan4github/murasaki_samples@2691b0f · GitHub
[go: up one dir, main page]
Skip to content

Commit

Permalink
Update to the newest murasaki.
Browse files Browse the repository at this point in the history
  • Loading branch information
@suikan4github
suikan4github committed Mar 8, 2020
1 parent 728fc18 commit 2691b0f
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 183 deletions.
16 changes: 1 addition & 15 deletions nucleo-f091-64/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,21 +209,6 @@
<project id="nucleo-f091-sample.null.138962782" name="nucleo-f091-sample"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.923386856;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.923386856.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1593893110;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1681892730">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309663515;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309663515.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.308951870;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.804133466">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309663515;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309663515.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1440530150;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.743625978">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.923386856;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.923386856.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1059393813;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1138024052">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug">
Expand All @@ -233,4 +218,5 @@
<resource resourceType="PROJECT" workspacePath="/nucleo-f091-sample"/>
</configuration>
</storageModule>
<storageModule moduleId="scannerConfiguration"/>
</cproject>
2 changes: 1 addition & 1 deletion nucleo-f091-64/Inc/platform_defs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct Platform
BitOutStrategy * led; ///< GP out under test
TaskStrategy * task1; ///< Task under test
I2CMasterStrategy * i2c_master; ///< I2C Master under test
Synchronizer * button_sync; ///< Syncronizer demo
InterruptStrategy * b1; ///< Exti demo

// Following block is just sample

Expand Down
102 changes: 29 additions & 73 deletions nucleo-f091-64/Src/murasaki_platform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// Essential definition.
// Do not delete
murasaki::Platform murasaki::platform;
murasaki::Debugger * murasaki::debugger;
murasaki::Debugger *murasaki::debugger;

/* ------------------------ STM32 Peripherals ----------------------------- */

Expand All @@ -43,8 +43,7 @@ extern UART_HandleTypeDef huart2;

/* -------------------- PLATFORM Prototypes ------------------------- */

void TaskBodyFunction(const void* ptr);
void I2cSearch(murasaki::I2CMasterStrategy * master);
void TaskBodyFunction(const void *ptr);

/* -------------------- PLATFORM Implementation ------------------------- */

Expand Down Expand Up @@ -95,8 +94,8 @@ void InitPlatform()
murasaki::platform.i2c_master = new murasaki::I2cMaster(&hi2c1);
MURASAKI_ASSERT(nullptr != murasaki::platform.i2c_master)

murasaki::platform.button_sync = new murasaki::Synchronizer();
MURASAKI_ASSERT(nullptr != murasaki::platform.button_sync)
murasaki::platform.b1 = new murasaki::Exti(B1_Pin);
MURASAKI_ASSERT(nullptr != murasaki::platform.b1)

}

Expand All @@ -110,12 +109,11 @@ void ExecPlatform()

// waiting for the Button push.
murasaki::debugger->Printf("!!! Push blue button to start the demo \n");
murasaki::platform.button_sync->Wait();
murasaki::platform.b1->Wait();

// List up connected I2C device to the console.
I2cSearch(murasaki::platform.i2c_master);


// Loop forever
while (true) {

Expand Down Expand Up @@ -147,7 +145,7 @@ void ExecPlatform()
* In this call back, the uart device handle have to be passed to the
* murasaki::Uart::TransmissionCompleteCallback() function.
*/
void HAL_UART_TxCpltCallback(UART_HandleTypeDef * huart)
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
{
// Poll all uart tx related interrupt receivers.
// If hit, return. If not hit,check next.
Expand All @@ -171,7 +169,7 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef * huart)
* In this call back, the uart device handle have to be passed to the
* murasaki::Uart::ReceiveCompleteCallback() function.
*/
void HAL_UART_RxCpltCallback(UART_HandleTypeDef * huart)
void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
{
// Poll all uart rx related interrupt receivers.
// If hit, return. If not hit,check next.
Expand Down Expand Up @@ -276,7 +274,7 @@ void HAL_SPI_ErrorCallback(SPI_HandleTypeDef * hspi) {
* In this call back, the uart device handle have to be passed to the
* murasaki::I2c::TransmitCompleteCallback() function.
*/
void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef * hi2c)
void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c)
{
// Poll all I2C master tx related interrupt receivers.
// If hit, return. If not hit,check next.
Expand All @@ -300,12 +298,12 @@ void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef * hi2c)
* In this call back, the uart device handle have to be passed to the
* murasaki::Uart::ReceiveCompleteCallback() function.
*/
void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c) {
void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c) {
// Poll all I2C master rx related interrupt receivers.
// If hit, return. If not hit,check next.
#if 1
if (murasaki::platform.i2c_master->ReceiveCompleteCallback(hi2c))
return;
return;
#endif
}
/**
Expand All @@ -323,7 +321,7 @@ void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c) {
* In this call back, the I2C slave device handle have to be passed to the
* murasaki::I2cSlave::TransmitCompleteCallback() function.
*/
void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef * hi2c)
void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c)
{
// Poll all I2C master tx related interrupt receivers.
// If hit, return. If not hit,check next.
Expand All @@ -347,7 +345,7 @@ void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef * hi2c)
* In this call back, the I2C slave device handle have to be passed to the
* murasaki::I2cSlave::ReceiveCompleteCallback() function.
*/
void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef * hi2c) {
void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c) {
// Poll all I2C master rx related interrupt receivers.
// If hit, return. If not hit,check next.
#if 0
Expand All @@ -371,12 +369,12 @@ void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef * hi2c) {
* In this call back, the uart device handle have to be passed to the
* murasaki::I2c::HandleError() function.
*/
void HAL_I2C_ErrorCallback(I2C_HandleTypeDef * hi2c) {
void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c) {
// Poll all I2C master error related interrupt receivers.
// If hit, return. If not hit,check next.
#if 1
if (murasaki::platform.i2c_master->HandleError(hi2c))
return;
return;
#endif
}

Expand Down Expand Up @@ -448,21 +446,18 @@ void HAL_SAI_ErrorCallback(SAI_HandleTypeDef * hsai) {
* The GPIO_Pin is the number of Pin. For example, if a programmer set the pin name by CubeIDE as FOO, the
* macro to identify that EXTI is FOO_Pin
*/
void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
#if 1
// Sample of the EXTI call back.
// USER_Btn is a standard name of the user push button switch of the Nucleo F722.
// This switch can be configured as EXTI interrupt srouce.
// In this sample, releasing the waiting task if interrupt comes.

// Check whether appropriate interrupt or not
if ( B1_Pin == GPIO_Pin) {
// Check whether sync object is ready or not.
// This check is essential to guard from the interrupt before the platform variable is ready
if (murasaki::platform.button_sync != nullptr)
// Check whether sync object is ready or not.
// This check is essential to guard from the interrupt before the platform variable is ready
if (murasaki::platform.b1 != nullptr)
// release the waiting task
murasaki::platform.button_sync->Release();
}
murasaki::platform.b1->Release(GPIO_Pin);
#endif
}

Expand All @@ -486,12 +481,12 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
* By default, this routine output a message with location informaiton
* to the debugger console.
*/
void CustomAssertFailed(uint8_t* file, uint32_t line)
void CustomAssertFailed(uint8_t *file, uint32_t line)
{
murasaki::debugger->Printf("Wrong parameters value: file %s on line %d\n",
file,
line);
// To stop the execusion, raise assert.
// To stop the execusion, raise assert.
MURASAKI_ASSERT(false);
}

Expand Down Expand Up @@ -532,7 +527,7 @@ __asm volatile (
* Do not call from application. This is murasaki_internal_only.
*
*/
void PrintFaultResult(unsigned int * stack_pointer) {
void PrintFaultResult(unsigned int *stack_pointer) {

murasaki::debugger->Printf("\nSpurious exception or hardfault occured. \n");
murasaki::debugger->Printf("Stacked R0 : 0x%08X \n", stack_pointer[0]);
Expand All @@ -544,13 +539,13 @@ void PrintFaultResult(unsigned int * stack_pointer) {
murasaki::debugger->Printf("Stacked PC : 0x%08X \n", stack_pointer[6]);
murasaki::debugger->Printf("Stacked PSR : 0x%08X \n", stack_pointer[7]);

murasaki::debugger->Printf(" CFSR : 0x%08X \n", *(unsigned int *) 0xE000ED28);
murasaki::debugger->Printf(" HFSR : 0x%08X \n", *(unsigned int *) 0xE000ED2C);
murasaki::debugger->Printf(" DFSR : 0x%08X \n", *(unsigned int *) 0xE000ED30);
murasaki::debugger->Printf(" AFSR : 0x%08X \n", *(unsigned int *) 0xE000ED3C);
murasaki::debugger->Printf(" CFSR : 0x%08X \n", *(unsigned int*) 0xE000ED28);
murasaki::debugger->Printf(" HFSR : 0x%08X \n", *(unsigned int*) 0xE000ED2C);
murasaki::debugger->Printf(" DFSR : 0x%08X \n", *(unsigned int*) 0xE000ED30);
murasaki::debugger->Printf(" AFSR : 0x%08X \n", *(unsigned int*) 0xE000ED3C);

murasaki::debugger->Printf(" MMAR : 0x%08X \n", *(unsigned int *) 0xE000ED34);
murasaki::debugger->Printf(" BFAR : 0x%08X \n", *(unsigned int *) 0xE000ED38);
murasaki::debugger->Printf(" MMAR : 0x%08X \n", *(unsigned int*) 0xE000ED34);
murasaki::debugger->Printf(" BFAR : 0x%08X \n", *(unsigned int*) 0xE000ED38);

murasaki::debugger->Printf("(Note : To avoid the stacking by C compiler, use release build to investigate the fault. ) \n");

Expand Down Expand Up @@ -581,50 +576,11 @@ void vApplicationStackOverflowHook(TaskHandle_t xTask,
*
* You can delete this function if you don't use.
< F438 span class="pl-c"> */
void TaskBodyFunction(const void* ptr) {
void TaskBodyFunction(const void *ptr) {

while (true) // dummy loop
{
murasaki::platform.led->Toggle(); // toggling LED
murasaki::Sleep(700);
}
}

/**
* @brief I2C device serach function
* @param master Pointer to the I2C master controller object.
* @details
* Poll all device address and check the response. If no response(NAK),
* there is no device.
*
* This function can be deleted if you don't use.
*/
#if 1
void I2cSearch(murasaki::I2CMasterStrategy * master)
{
uint8_t tx_buf[1];

murasaki::debugger->Printf("\n Probing I2C devices \n");
murasaki::debugger->Printf(" | 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n");
murasaki::debugger->Printf("---+------------------------------------------------\n");

// Search raw
for (int raw = 0; raw < 128; raw += 16) {
// Search column
murasaki::debugger->Printf("%2x |", raw);
for (int col = 0; col < 16; col++) {
murasaki::I2cStatus result;
// check whether device exist or not.
result = master->Transmit(raw + col, tx_buf, 0);
if (result == murasaki::ki2csOK) // device acknowledged.
murasaki::debugger->Printf(" %2X", raw + col); // print address
else if (result == murasaki::ki2csNak) // no device
murasaki::debugger->Printf(" --");
else
murasaki::debugger->Printf(" ??"); // unpredicted error.
}
murasaki::debugger->Printf("\n");
}

}
#endif
2 changes: 1 addition & 1 deletion nucleo-f091-64/murasaki
Submodule murasaki updated 36 files
+36 −1 CHANGELOG.md
+133 −0 Inc/adc.hpp
+72 −0 Inc/adcstrategy.hpp
+64 −13 Inc/audioportadapterstrategy.hpp
+64 −15 Inc/duplexaudio.hpp
+108 −0 Inc/exti.hpp
+29 −0 Inc/i2cmaster.hpp
+31 −0 Inc/i2cslave.hpp
+216 −0 Inc/i2sportadapter.hpp
+57 −0 Inc/interruptstrategy.hpp
+8 −1 Inc/murasaki.hpp
+21 −14 Inc/murasaki_4_mod.hpp
+47 −20 Inc/murasaki_defs.hpp
+29 −0 Inc/murasaki_utility.hpp
+76 −0 Inc/quadratureencoder.hpp
+50 −0 Inc/quadratureencoderstrategy.hpp
+75 −10 Inc/saiportadapter.hpp
+19 −1 Inc/spimaster.hpp
+19 −0 Inc/spislave.hpp
+46 −18 Inc/uart.hpp
+4 −1 README.md 10000
+272 −0 Src/adc.cpp
+99 −40 Src/duplexaudio.cpp
+232 −0 Src/exti.cpp
+279 −0 Src/i2sportadapter.cpp
+37 −0 Src/murasaki_i2ssearch.cpp
+0 −1 Src/murasaki_syslog.cpp
+65 −0 Src/quadratureencoder.cpp
+347 −0 Src/saiportadapter.cpp
+0 −199 Src/saiportadaptor.cpp
+15 −15 Src/spimaster.cpp
+15 −15 Src/spislave.cpp
+7 −3 doc/murasaki.doxyfile
+ − doc/refman.pdf
+119 −143 template/murasaki_platform.cpp
+7 −19 template/platform_defs.hpp
19 changes: 6 additions & 13 deletions nucleo-f446-64/Inc/platform_defs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ namespace murasaki {
struct Platform
{
// Platform dependent Custom variables.
UartStrategy * uart_console; ///< UART wrapping class object for debugging
LoggerStrategy * logger; ///< logging class object for debugger
UartStrategy *uart_console; ///< UART wrapping class object for debugging
LoggerStrategy *logger; ///< logging class object for debugger

BitOutStrategy * led; ///< GP out under test
TaskStrategy * task1; ///< Task under test
I2CMasterStrategy * i2c_master; ///< I2C Master under test
Synchronizer * button_sync; ///< Syncronizer demo
BitOutStrategy *led; ///< GP out under test
TaskStrategy *task1; ///< Task under test
I2CMasterStrategy *i2c_master; ///< I2C Master under test
InterruptStrategy *b1; ///< Exti demo

// Following block is just sample


};

/**
Expand All @@ -59,17 +58,11 @@ struct Platform
*/
extern Platform platform;




/**
* \}
* end of defgroup PLATFORM_GROUP
*/



} /* namespace murasaki */


#endif /* PLATFORM_DEFS_HPP_ */
Loading

0 comments on commit 2691b0f

Please sign in to comment.
0