Qt » miniminutnik.diff
| .gitmodules | ||
|---|---|---|
| 1 | 1 |
[submodule "libarena"] |
| 2 | 2 |
path = libarena |
| 3 |
url = git@git.seesslen.net:src/libarena
|
|
| 3 |
url = ../libarena
|
|
| 4 | 4 |
[submodule "libbiwak"] |
| 5 | 5 |
path = libbiwak |
| 6 |
url = git@git.seesslen.net:src/libbiwak
|
|
| 6 |
url = ../libbiwak
|
|
| 7 | 7 |
[submodule "libcampo"] |
| 8 | 8 |
path = libcampo |
| 9 |
url = git@git.seesslen.net:src/libcampo
|
|
| 9 |
url = ../libcampo
|
|
| 10 | 10 |
[submodule "liblepto"] |
| 11 | 11 |
path = liblepto |
| 12 |
url = git@git.seesslen.net:src/liblepto
|
|
| 12 |
url = ../liblepto
|
|
| 13 | 13 |
[submodule "libHALWrapper"] |
| 14 | 14 |
path = libHALWrapper |
| 15 |
url = git@git.seesslen.net:src/libHALWrapper
|
|
| 15 |
url = ../libHALWrapper
|
|
| 16 | 16 |
[submodule "libfosh"] |
| 17 | 17 |
path = libfosh |
| 18 |
url = git@git.seesslen.net:src/libfosh |
|
| 18 |
url = ../libfosh |
|
| libHALWrapper | ||
|---|---|---|
| 1 |
Subproject commit 2229acf0255de6a97c50849034f19f21588b0375 |
|
| 1 |
Subproject commit edaca10c1e82ec003eb3c84519f7c713e13aba2f |
|
| libarena | ||
|---|---|---|
| 1 |
Subproject commit 7acf742ee845acb7c15d106433c51a237b8b11fc |
|
| 1 |
Subproject commit c34cd161fc497bfe13d011797cc563073e768c0c-dirty |
|
| libbiwak | ||
|---|---|---|
| 1 |
Subproject commit ed2771d10246947afd58ef42e7f2d0f5762f83a3 |
|
| 1 |
Subproject commit a008179b03a6673877a337dbdc97b7fdb5abe3ec-dirty |
|
| libcampo | ||
|---|---|---|
| 1 |
Subproject commit d8ceff172fe8f15481781e0397beea8b0b20ced1 |
|
| 1 |
Subproject commit b5000a411c4c4dfa4675e1c82c30c33b954ce746 |
|
| libfosh | ||
|---|---|---|
| 1 |
Subproject commit 575ef132b9d5b6ae05eb390c52ff993819ac9c9e |
|
| 1 |
Subproject commit 5444adf91fb50985017f7534046c9c520babc072-dirty |
|
| liblepto | ||
|---|---|---|
| 1 |
Subproject commit 575db37595a63e364839cf28bb302f748b68c6b9 |
|
| 1 |
Subproject commit 3958bf62dbf352baa1dcfe1dce449c7de6fe03da |
|
| minutnik/include/minutnik.h | ||
|---|---|---|
| 52 | 52 | |
| 53 | 53 |
goError, |
| 54 | 54 |
error, |
| 55 |
invalid, |
|
| 55 | 56 |
}; |
| 56 | 57 | |
| 57 | 58 |
struct SItems |
| minutnik/src/main.cpp | ||
|---|---|---|
| 15 | 15 |
#include "git_version.h" |
| 16 | 16 |
#if defined STM32 |
| 17 | 17 |
#include <HALWrapper/stm32_hal.h> |
| 18 |
#else |
|
| 19 |
//#include <QApplication> |
|
| 18 | 20 |
#endif |
| 19 | 21 | |
| 20 | 22 | |
| ... | ... | |
| 52 | 54 |
#endif |
| 53 | 55 | |
| 54 | 56 | |
| 57 |
#if 1 |
|
| 55 | 58 |
while( 1 ) |
| 56 | 59 |
{
|
| 57 | 60 |
pMinutnik->eventLoop(); |
| ... | ... | |
| 65 | 68 |
usleep( USECS_PER_SEC / (120) ); // 24*4hz is necessary for buzzer whistle |
| 66 | 69 |
} |
| 67 | 70 |
} |
| 71 |
#endif |
|
| 68 | 72 | |
| 69 |
return(0); |
|
| 73 |
//return( QApplication::instace()-> exec() ); |
|
| 74 |
return( biwakExec() ); |
|
| 70 | 75 |
} |
| 71 | 76 | |
| 72 | 77 | |
| minutnik/src/minutnik.cpp | ||
|---|---|---|
| 15 | 15 | |
| 16 | 16 |
//---Includes----------------------------------------------------------------- |
| 17 | 17 | |
| 18 |
#if BIWAK_PLATFORM == ddd |
|
| 19 |
#error biwak platform not set |
|
| 20 |
#elif BIWAK_PLATFORM == linux |
|
| 21 |
#define LEPTO_LOG_DEBUG 1 |
|
| 22 |
#endif |
|
| 18 | 23 | |
| 19 | 24 |
//#include <arena/platform.h> |
| 20 | 25 |
#include <arena/config.h> |
| ... | ... | |
| 166 | 171 | |
| 167 | 172 |
void CMiniMinutnik::stateMachineEgg() |
| 168 | 173 |
{
|
| 174 |
#if LEPTO_LOG_DEBUG |
|
| 175 |
static EState prev=EState::invalid; |
|
| 176 |
if( m_state != prev ) |
|
| 177 |
{
|
|
| 178 |
lDebug("State: %d", m_state == EState::running);
|
|
| 179 |
prev=m_state; |
|
| 180 |
} |
|
| 181 |
#endif |
|
| 182 | ||
| 169 | 183 |
if( m_state == EState::running ) |
| 170 | 184 |
{
|
| 171 | 185 |
if( lrElapsedMSeconds( &m_startupTimer , MSECS_PER_MIN * MM_AUTO_OFF ) ) |
| ... | ... | |
| 585 | 599 |
// |
| 586 | 600 |
}; |
| 587 | 601 |
#else |
| 588 |
exit(22); |
|
| 602 |
printf("Power off.\n");
|
|
| 603 |
exit(0); |
|
| 589 | 604 |
#endif |
| 590 | 605 |
} |
| 591 | 606 | |