Skip to content

Commit

Permalink
Merge pull request #64 from RobertGawron/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
RobertGawron authored Nov 6, 2020
2 parents 76ba7fd + 161770e commit 87d862f
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: install latex and generate documents
run: |
sudo apt-get install -y texlive-latex-base texlive-latex-extra texlive-extra-utils poppler-utils pdf2svg
cd ./ContinousIntegration
cd ./ContinuousIntegration
chmod +x ./run_generate_docs.sh
./run_generate_docs.sh
mkdir result
Expand All @@ -23,4 +23,4 @@ jobs:
if: always()
with:
name: Latex Documents
path: ./ContinousIntegration/result
path: ./ContinuousIntegration/result
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Continous Integration
# ContinuousIntegration

This folder contains scripts run by GitHub continuous integration module. These scripts should be also run locally before pull request.
File renamed without changes.
2 changes: 1 addition & 1 deletion Simulation/SignalFilter/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Filtration of output signal by using digital filterr
# Filtration of output signal by using digital filter

This is a dummy attempt to check how digital signal filtering could help removing noise. When writing this simulation, I didn't have the device, so couldn't use exact values. Nevertheless it seems that this will be helpful way to improve signal quality.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: install cppcheck and run tests
run: |
sudo apt-get install -y cppcheck
cd ./ContinousIntegration
cd ./ContinuousIntegration
chmod +x ./run_c_static_code_analysis.sh
ls run_c_static_code_analysis.sh
./run_c_static_code_analysis.sh
Expand All @@ -23,7 +23,7 @@ jobs:
if: always()
run: |
sudo pip install flake8 flake8-html
cd ./ContinousIntegration
cd ./ContinuousIntegration
chmod +x ./run_python_static_code_analysis.sh
ls
./run_python_static_code_analysis.sh
Expand All @@ -33,11 +33,11 @@ jobs:
if: always()
with:
name: Report for Python sources
path: ./ContinousIntegration/python_lint_repport/
path: ./ContinuousIntegration/python_lint_report/

- name: Archive C results
uses: actions/upload-artifact@v2
if: always()
with:
name: Report for C sources
path: ./ContinousIntegration/C_Lint_*.txt
path: ./ContinuousIntegration/C_Lint_*.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Build and run tests
run: |
sudo pip install pytest pytest-html
cd ./ContinousIntegration
cd ./ContinuousIntegration
chmod +x ./run_unit_tests.sh
./run_unit_tests.sh
Expand Down

This file was deleted.

2 changes: 2 additions & 0 deletions Software/HardwareDataLogger/ContinuousIntegration/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
C_Lint_ReportApplicationOnly.txt
C_Lint_ReportFull.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Continous Integration
# ContinuousIntegration

This folder contains scripts run by GitHub continuous integration module. These scripts should be also run locally before pull request.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flake8 --format=html --htmldir=python_lint_report ../Simulation/FirmwarePCSimulator
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This project consists of two parts:
Note that in order to load .so object into an application, both of them needs to be 32bits, or 64bits. In case of errors during loading .so object, check your version on Python and gcc (both should be either 32bits or 64bits).

## Requirements
- Intsall PyQt5
- Install PyQt5

```pip install PyQt5```
- Install gcc an makefile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
#include "gm_circular_buffer.h"
#include "gm_measurement.h"

static volatile GMMeasurement_Value_t occurenceCounter;
static volatile GMMeasurement_Value_t occurrenceCounter;

void GMMeasurementCalculator_Init()
{
GMCircularBuffer_Init();
occurenceCounter = 0U;
occurrenceCounter = 0U;
}

void GMMeasurementCalculator_OnSamplingDone()
{
GMCircularBuffer_Insert(occurenceCounter);
GMCircularBuffer_Insert(occurrenceCounter);

// reset counter to start from the beginning for the new sample
occurenceCounter = 0;
occurrenceCounter = 0;
}

void GMMeasurementCalculator_OnGMPulseObserved()
{
if (occurenceCounter < SAMPLE_STORAGE_ELEMENT_MAX_VALUE)
if (occurrenceCounter < SAMPLE_STORAGE_ELEMENT_MAX_VALUE)
{
occurenceCounter++;
occurrenceCounter++;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void GMViewHistogram_ShowHistogram()
uint16_t binValue = GMHistogram_GetBinValue(i, histogramBinAmount);
uint32_t normalizedBinValue = binValue * graphHeight/ maxBinValue;

uint8_t x1 = binWidthOnDisplay - 1; // one pixel to avoiid overlap
uint8_t x1 = binWidthOnDisplay - 1; // one pixel to avoid overlap
GMDisplayHW_DrawRectangle(x0, GMDisplayHW_GetDisplayHeight()-normalizedBinValue, x1, GMDisplayHW_GetDisplayHeight());

x0 += binWidthOnDisplay;
Expand Down

0 comments on commit 87d862f

Please sign in to comment.