Skip to content

Commit

Permalink
Merge pull request #7 from petrmadecki/main
Browse files Browse the repository at this point in the history 
Oprava chyby při použití funkce time().
  • Loading branch information
@petrmadecki
petrmadecki authored Apr 14, 2023
2 parents 170cfca + ef2735d commit be45a79
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 51 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@

## [Unreleased]:

## [1.2.5] - 2023-04-14

### Added:
- (#6) Úprava driveru `chrono.h`, při použití funkce `time()` přestal přípravek reagovat.
- Změna funkce `time()` z knihovny `time.h` na vlastní, kooperující se SysTick místo RTC.

### Modified:
- Doplnění popisu k předchozímu releasu (1.1.5)

## [1.1.5] - 2023-04-13

### Added:
- (#5) Přidání podpory pro vlastní znaky.
- (#5) Přidání podpory pro vlastní znaky: `LCD_customChar_write()` a `LCD_customChar_read()`.
- `LCD_customChar_table.h` prostor pro definování vlastních znaků.


## [1.0.5] - 2023-03-31
Expand Down
2 changes: 1 addition & 1 deletion arm.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>ST-LINKIII-KEIL_SWO</Key>
<Name>-U53FF6E064980555708381287 -O206 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC16000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
<Name>-U0669FF3731324B4D43182926 -O206 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC16000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
Expand Down
47 changes: 0 additions & 47 deletions arm.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,53 +909,6 @@
<FileName>main.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\main.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<FileArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>2</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<useXO>2</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>2</vShortEn>
<vShortWch>2</vShortWch>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
</FileArmAds>
</FileOption>
</File>
</Files>
</Group>
Expand Down
32 changes: 30 additions & 2 deletions include/chrono.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,23 @@
#ifndef ARM_KIT_CHRONO
#define ARM_KIT_CHRONO

//#================================================================================================
//#=== Osetreni pro pouziti funkce time() - I. cast, ZACATEK
#include <stdlib.h>
#include <time.h>

#pragma import(__use_no_semihosting_swi)
//#=== Osetreni pro pouziti funkce time() - I. cast, KONEC
//#================================================================================================

//#================================================================================================
//#=== Casove funkce - ZACATEK

#ifndef CLK_DIV
#define CLK_DIV 1000 // Hodnota pro upravu CLK, viz hl. popisek.
#endif

static volatile uint32_t Ticks; // Vyuzito pro SysTick k nacitani Ticku pri podteceni.
volatile uint32_t Ticks; // Vyuzito pro SysTick k nacitani Ticku pri podteceni.

/**
* @brief Rutina pro obsluhu preruseni SysTick.
Expand All @@ -78,7 +87,7 @@ void delay(uint32_t value) {
/**
* @brief Funkce pro umele pozdrzeni programu.
*
* @param[in] value Hodnota v rozmezi 0 - 65535.
* @param value Hodnota v rozmezi 0 - 65535.
*/
void cekej(uint16_t value) {
uint16_t i, j;
Expand All @@ -93,4 +102,23 @@ void cekej(uint16_t value) {
//#=== Casove funkce - KONEC
//#================================================================================================

//#================================================================================================
//#=== Osetreni pro pouziti funkce time() - II. cast, ZACATEK
/**
* @brief Nahrada puvodni funkce time() vracejici pocet sekund od 1. 1. 1970.
* Tato funkce vraci pocet preteceni SysTick od spusteni pripravku.
* V pripade pouziti pro generovani nahodnych cisel, je pri kazdem resetu pocet nulovan!
*/
time_t time(time_t *t) {
return Ticks;
}

void _sys_exit(int returncode) {
while(1) {
/* __NOP(); */
}
}
//#=== Osetreni pro pouziti funkce time() - II. cast, KONEC
//#================================================================================================

#endif /* ARM_KIT_CHRONO */

0 comments on commit be45a79

Please sign in to comment.