Skip to content

Commit e5e79bf

Browse files
gabryelreyesgabryelreyes
authored
Merge pull request #122 from BlueAndi/extractHALs
Integrate HAL extraction
2 parents 9aed08b + bbf2f77 commit e5e79bf

File tree

312 files changed

+285
-11794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+285
-11794
lines changed

‎.gitattributes

+17-17
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
* text=crlf
33

44
# All text files are CRLF
5-
*.txt text eol=crlf
6-
*.h text eol=crlf
7-
*.c text eol=crlf
8-
*.cpp text eol=crlf
9-
*.hpp text eol=crlf
10-
*.py text eol=crlf
11-
*.json text eol=crlf
12-
*.md text eol=crlf
13-
*.puml text eol=crlf
14-
*.plantuml text eol=crlf
15-
*.ini text eol=crlf
16-
*.bat text eol=crlf
17-
*.yml text eol=crlf
18-
*.csv text eol=crlf
5+
*.txt text eol=crlf
6+
*.h text eol=crlf
7+
*.c text eol=crlf
8+
*.cpp text eol=crlf
9+
*.hpp text eol=crlf
10+
*.py text eol=crlf
11+
*.json text eol=crlf
12+
*.md text eol=crlf
13+
*.puml text eol=crlf
14+
*.plantuml text eol=crlf
15+
*.ini text eol=crlf
16+
*.bat text eol=crlf
17+
*.yml text eol=crlf
18+
*.csv text eol=crlf
1919

2020
# Webots files are generated by a tool as LF
21-
*.proto text eol=lf
22-
*.wbt text eol=lf
21+
*.proto text eol=lf
22+
*.wbt text eol=lf
2323

2424
# Doxygen files are generated by a tool as LF
25-
doc/doxygen/* text eol=lf
25+
doc/doxygen/* text eol=lf
2626

2727
# Images should be treated as binary
2828
*.png binary

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
.vscode/ipch
66
.vscode/extensions.json
77
lib/Webots
8-
webots/worlds/*.wbproj
9-
webots/worlds/*.jpg
8+
*.wbproj
9+
__pycache__

‎README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ Example for the **LineFollowerTarget** application:
166166

167167
# Used Libraries
168168

169-
| Library | Description | License |
170-
| ----------------------------------------------------------------------- | ----------------------------------------- | ------- |
171-
| [Zumo32U4 library](https://github.com/pololu/zumo-32u4-arduino-library) | Provides access to the Zumo32U4 hardware. | MIT |
172-
| [SerialMuxProt](https://github.com/gabryelreyes/SerialMuxProt) | Multiplexing Communication Protocol | MIT |
169+
| Library | Description | License |
170+
| ------------------------------------------------------------------ | ---------------------------------------------------- | ------- |
171+
| [SerialMuxProt](https://github.com/gabryelreyes/SerialMuxProt) | Multiplexing Communication Protocol | MIT |
172+
| [ZumoHALATmega32u4](https://github.com/BlueAndi/ZumoHALATmega32u4) | C++ HAL for ATmega32u4 on the Pololu Zumo32u4 | MIT |
173+
| [ZumoHALInterfaces](https://github.com/BlueAndi/ZumoHALInterfaces) | Abstract C++ HAL interfaces | MIT |
174+
| [ZumoHALWebots](https://github.com/BlueAndi/ZumoHALWebots) | C++ HAL for Webots simulation of the Pololu Zumo32u4 | MIT |
173175

174176
# Issues, Ideas And Bugs
175177
If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/RadonUlzer/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.

‎doc/architecture/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ Improvement for better accuracy:
9393
![speedometer](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/BlueAndi/RadonUlzer/main/doc/architecture/uml/LogicalView/Speedometer.plantuml)
9494

9595
### HAL
96-
The hardware abstraction layer (HAL) for the target is shown. For the simulation and the test only the realization part is different and may base on other 3rd party components.
97-
98-
![hal](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/BlueAndi/RadonUlzer/main/doc/architecture/uml/LogicalView/HAL.plantuml)
96+
The hardware abstraction layer (HAL) depends on the target.
97+
* **ATmega32u4 on the Zumo32u4**: [ZumoHALATmega32u4](https://github.com/BlueAndi/ZumoHALATmega32u4)
98+
* **Zumo in Webots**: [ZumoHALWebots](https://github.com/BlueAndi/ZumoHALWebots)
99+
* **Zumo Test**: [HALTest](/lib/HALTest/)
99100

100101
## Process View
101102

‎doc/architecture/uml/DevelopmentView/Layers.plantuml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ Application ...> HAL: <<access>>
1212
Service ..> HAL: <<access>>
1313

1414
package "HAL" as halDetail {
15-
package HALInterfaces
16-
package HALTarget
17-
package HALSim
15+
package ZumoHALInterfaces
16+
package ZumoHALATmega32u4
17+
package ZumoHALWebots
1818
package HALTest
1919

20-
HALInterfaces <|.. HALTarget: <<realize>>
21-
HALInterfaces <|.. HALSim: <<realize>>
22-
HALInterfaces <|.. HALTest: <<realize>>
20+
ZumoHALInterfaces <|.. ZumoHALATmega32u4: <<realize>>
21+
ZumoHALInterfaces <|.. ZumoHALWebots: <<realize>>
22+
ZumoHALInterfaces <|.. HALTest: <<realize>>
2323
}
2424

2525
HAL -[hidden]-- halDetail

‎doc/architecture/uml/LogicalView/HAL.plantuml

-182
This file was deleted.

‎doc/doxygen/CalibSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALSim \
915-
../../lib/HALInterfaces \
916914
../../lib/APPCalib \
917915
../../lib/HALCalibSim
918916

‎doc/doxygen/CalibTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALTarget \
915-
../../lib/HALInterfaces \
916914
../../lib/APPCalib \
917915
../../lib/HALCalibTarget
918916

‎doc/doxygen/ConvoyFollowerSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALSim \
915-
../../lib/HALInterfaces \
916914
../../lib/APPConvoyFollower \
917915
../../lib/HALConvoyFollowerSim
918916

‎doc/doxygen/ConvoyFollowerTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALTarget \
915-
../../lib/HALInterfaces \
916914
../../lib/APPConvoyFollower \
917915
../../lib/HALConvoyFollowerTarget
918916

‎doc/doxygen/ConvoyLeaderSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALSim \
915-
../../lib/HALInterfaces \
916914
../../lib/APPConvoyLeader \
917915
../../lib/HALConvoyLeaderSim
918916

‎doc/doxygen/ConvoyLeaderTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALTarget \
915-
../../lib/HALInterfaces \
916914
../../lib/APPConvoyLeader \
917915
../../lib/HALConvoyLeaderTarget
918916

‎doc/doxygen/LineFollowerSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -912,8 +912,6 @@ INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/APPLineFollower \
914914
../../lib/Service \
915-
../../lib/HALSim \
916-
../../lib/HALInterfaces \
917915
../../lib/HALLineFollowerSim
918916

919917
# This tag can be used to specify the character encoding of the source files

‎doc/doxygen/LineFollowerTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -912,8 +912,6 @@ INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/APPLineFollower \
914914
../../lib/Service \
915-
../../lib/HALTarget \
916-
../../lib/HALInterfaces \
917915
../../lib/HALLineFollowerTarget
918916

919917
# This tag can be used to specify the character encoding of the source files

‎doc/doxygen/RemoteControlSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALSim \
915-
../../lib/HALInterfaces \
916914
../../lib/HALRemoteControlSim \
917915
../../lib/APPRemoteControl
918916

‎doc/doxygen/RemoteControlTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALTarget \
915-
../../lib/HALInterfaces \
916914
../../lib/APPRemoteControl \
917915
../../lib/HALRemoteControlTarget
918916

‎doc/doxygen/SensorFusionSimDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALSim \
915-
../../lib/HALInterfaces \
916914
../../lib/HALSensorFusionSim \
917915
../../lib/APPSensorFusion
918916

‎doc/doxygen/SensorFusionTargetDoxyfile

-2
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ WARN_LOGFILE = doxygen_warnings.txt
911911
INPUT = mainpage.dox \
912912
../../src \
913913
../../lib/Service \
914-
../../lib/HALTarget \
915-
../../lib/HALInterfaces \
916914
../../lib/APPSensorFusion \
917915
../../lib/HALSensorFusionTarget
918916

0 commit comments

Comments
 (0)