Skip to content
Snippets Groups Projects
Commit 00a5f740 authored by Lennard Karger's avatar Lennard Karger
Browse files

Merge branch 'Developement_Karger' into 'MergeTest'

Vorbereitung Main merge PIO - Projektstrukturen

See merge request !3
parents 5a2e4eed 1919c792
No related branches found
No related tags found
1 merge request!3Vorbereitung Main merge PIO - Projektstrukturen
Showing
with 337 additions and 145 deletions
.gitignore
.pio
.vscode
{
"name": "BlePoll",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "ComRingBuf",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "EulerAngles",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "GpioCtrl",
"version": "0.0.1+20221111"
}
\ No newline at end of file
File mode changed from 100755 to 100644
Zur Kompatibilität mit platformIO wurde die Datei testLoopCheck umbenannt.
Wenn die Datei verwendet werden soll, muss die Dateiendung wieder auf .cpp geändert werden.
\ No newline at end of file
{
"name": "LoopCheck",
"version": "0.0.1+20221111",
"examples": [
{
"name": "lcBlink",
"base": "examples",
"files": ["lcBlink.ino"]
},
{
"name": "lcStatistics",
"base": "examples",
"files": ["lcStatistics.ino"]
},
{
"name": "testCppArduino",
"base": "examplesLinux",
"files": ["testArduino.cpp"]
},
{
"name": "testLoopCheck",
"base": "examplesWindows",
"files": ["testLoopCheck.cpp"]
}
],
"built": {
"srcFilter" : ["-<./examples>","-<./examplesLinux>","-<./examplesWindows>"]
},
"export":{
"exclude" : ["./examples", "./examplesLinux","./examplesWindows"]
}
}
\ No newline at end of file
{
"name": "MidiNotes",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "Monitor",
"version": "0.0.1+20221111"
}
\ No newline at end of file
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "EulerAngles.h" #include "EulerAngles.h"
//#define ProcMeasDebug //#define ProcMeasDebug
#define RAD_TO_DEG 57.2957795
typedef enum _PmState typedef enum _PmState
{ {
......
{
"name": "ProcMeas",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "SensorLSM9DS1",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "SoaapComDue",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "SoaapMsg",
"version": "0.0.1+20221111"
}
\ No newline at end of file
{
"name": "StateMachine",
"version": "0.0.1+20221111"
}
\ No newline at end of file
// ----------------------------------------------------------------------------
// SoaapBleMaster.h
// Beispielhafte Anwendung SOAAP / Steuerung optischer und akustischer Ausgaben
// Kommunikation über BLE-Funkanäle mit Bewerbungstelegrammen
// P o l l i n g - M a s t e r
// ----------------------------------------------------------------------------
// Editor: Robert Patzke
// URI/URL: www.mfp-portal.de
//-----------------------------------------------------------------------------
// Lizenz: CC-BY-SA (wikipedia: Creative Commons)
// Datum: 1. November 2021
// Letzte Bearbeitung: 15. März 2022
//
#ifndef SoaapBleMaster_h
#define SoaapBleMaster_h
// Vordefinitionen, Festlegungen zur Kompilierung
//
#define DebugTerminal
// Mit dieser Definition werden die Klasse Monitor und weitere Testmethoden
// eingebunden, womit ein anwendungsorientiertes Debugging möglich ist
//#define TEST001
// Ausgaben an serielle schnittstelle zur Prüfung der ap-Zustandsmaschine
#include "LoopCheck.h"
#include "StateMachine.h"
#include "nRF52840Radio.h"
#include "BlePoll.h"
#include "ComRingBuf.h"
#include "nRF52840Ser.h"
#include "SoaapMsg.h"
#include "Monitor.h"
// ----------------------------------------------------------------------------
// Vorwärtsreferenzen
// ----------------------------------------------------------------------------
//
void ctrlIdle();
void ctrlInit();
void sendCtrl();
void checkCtrl();
void apInit();
void apWaitDE();
void apWaitMeas();
void apProcMeas();
#ifdef DebugTerminal
// ----------------------
void smInit() ;
void smCheckJobs() ;
void smDebDword() ;
void smCtrlPolling() ;
void smWaitPolling() ;
void smReadPollValues() ;
void smCheckSer();
// ----------------------
#endif
#endif /* SoaapBleMaster_h */
#ifndef SoaapBleSlave_h
#define SoaapBleSlave_h
#include "LoopCheck.h"
#include "StateMachine.h"
#include "nRF52840Radio.h"
#include "BlePoll.h"
#include "ComRingBuf.h"
#include "nRF52840Ser.h"
#include "SoaapMsg.h"
#include "Monitor.h"
#include "nRF52840Twi.h"
#include "SensorLSM9DS1.h"
#include "nRF52840Gpio.h"
//#define SlaveACM1
bool sendData(PlpType plpType, byte *dest);
bool getValues(PlpType plpType, byte *dest);
void smInit();
void smCheckJobs();
void smCheckSens();
void smDebDword();
void smCtrlPolling();
void smWaitPolling();
void smSensReset1();
void smSensReset2();
void smSensGetValues1();
void smSensGetValues2();
void smSensGetValues3();
void smSensGetValues4();
void smSensGetValues5();
void smSensGetValues6();
void smSensGetValues7();
void smSensGetSoaapValues();
void smSensDebugValues();
void smSensGetErrors();
void smSensGetTimeOuts();
void smSensGetRunCounts();
#endif
\ No newline at end of file
{
"name": "environment",
"version": "0.0.1+20221111"
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment