Skip to content

Commit

Permalink
Merge branch 'master' into DESFire-AuthISO-Patch
Browse files Browse the repository at this point in the history
  • Loading branch information
maxieds authored Jun 17, 2022
2 parents 149599e + 0291b9b commit d29f087
Show file tree
Hide file tree
Showing 205 changed files with 3,533 additions and 4,254 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/firmware-desfire-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: DESFire-only Firmware Build (master Branch Push, Pre-release with Artifacts)

on:
push:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Make a firmware build folder
run: mkdir FirmwareBuild
- name: Print Kernel Ver
run: uname -a
- name: Update APT
run: sudo apt-get update -yqq
- name: Install AVR GCC Suite
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-avr binutils-avr gdb-avr avr-libc avrdude
- name: Make DESFire Firmware
run: make desfire
working-directory: Firmware/Chameleon-Mini/
- name: Move hex file to FirmwareBuild
run: mv Chameleon-Mini-DESFire.hex $GITHUB_WORKSPACE/FirmwareBuild/
working-directory: Firmware/Chameleon-Mini/
- name: Move eep file to FirmwareBuild
run: mv Chameleon-Mini-DESFire.eep $GITHUB_WORKSPACE/FirmwareBuild/
working-directory: Firmware/Chameleon-Mini/
- name: Upload Build Artifact to Action
uses: actions/upload-artifact@v2.1.4
with:
name: "ChameleonBuild"
path: "FirmwareBuild/**"
- name: Create a Pre-release
uses: actions/create-release@v1.1.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "${{ format('Build-DESFire-{0}', github.sha) }}"
release_name: DESFire-only Firmware Build ${{ github.sha }}
body: Built DESFire at commit ${{ github.sha }} from ${{ github.actor }}
draft: false
prerelease: true
- name: Upload Pre-release Artifacts
uses: linuxgemini/github-upload-release-artifacts-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
created_tag: "${{ format('Build-DESFire-{0}', github.sha) }}"
args: "FirmwareBuild/"
53 changes: 15 additions & 38 deletions Doc/Doxygen/html/_antenna_level_8h_source.html

Large diffs are not rendered by default.

67 changes: 22 additions & 45 deletions Doc/Doxygen/html/_application_8h_source.html

Large diffs are not rendered by default.

51 changes: 14 additions & 37 deletions Doc/Doxygen/html/_battery_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.11"/>
<meta name="generator" content="Doxygen 1.8.13"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>Chameleon-Mini: Battery.h Source File</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<script type="text/javascript">
$(document).ready(function() { init_search(); });
</script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
Expand All @@ -31,40 +29,19 @@
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.8.11 -->
<!-- Generated by Doxygen 1.8.13 -->
<script type="text/javascript">
var searchBox = new SearchBox("searchBox", "search",false,'Search');
</script>
<div id="navrow1" class="tabs">
<ul class="tablist">
<li><a href="index.html"><span>Main&#160;Page</span></a></li>
<li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
<li><a href="annotated.html"><span>Classes</span></a></li>
<li class="current"><a href="files.html"><span>Files</span></a></li>
<li>
<div id="MSearchBox" class="MSearchBoxInactive">
<span class="left">
<img id="MSearchSelect" src="search/mag_sel.png"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
alt=""/>
<input type="text" id="MSearchField" value="Search" accesskey="S"
onfocus="searchBox.OnSearchFieldFocus(true)"
onblur="searchBox.OnSearchFieldFocus(false)"
onkeyup="searchBox.OnSearchFieldChange(event)"/>
</span><span class="right">
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
</span>
</div>
</li>
</ul>
</div>
<div id="navrow2" class="tabs2">
<ul class="tablist">
<li><a href="files.html"><span>File&#160;List</span></a></li>
<li><a href="globals.html"><span>File&#160;Members</span></a></li>
</ul>
</div>
<script type="text/javascript" src="menudata.js"></script>
<script type="text/javascript" src="menu.js"></script>
<script type="text/javascript">
$(function() {
initMenu('',true,false,'search.php','Search');
$(document).ready(function() { init_search(); });
});
</script>
<div id="main-nav"></div>
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
Expand Down Expand Up @@ -92,9 +69,9 @@
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment"> * Battery.h</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment"> * Created on: 20.08.2014</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment"> * Author: sk</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="preprocessor">#ifndef BATTERY_H_</span></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="preprocessor">#define BATTERY_H_</span></div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="preprocessor">#include &quot;Common.h&quot;</span></div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno"> 13</span>&#160;<span class="preprocessor">#define BATTERY_PORT PORTD</span></div><div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160;<span class="preprocessor">#define BATTERY_STAT_PIN PIN0_bm</span></div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160;<span class="preprocessor">#define BATTERY_STAT_PINCTRL PIN0CTRL</span></div><div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160;<span class="preprocessor">#define BATTERY_PORT_MASK (BATTERY_STAT_PIN)</span></div><div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160;INLINE <span class="keywordtype">void</span> BatteryInit(<span class="keywordtype">void</span>) {</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160; BATTERY_PORT.DIRCLR = BATTERY_PORT_MASK;</div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; BATTERY_PORT.BATTERY_STAT_PINCTRL = PORT_OPC_PULLUP_gc;</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160;}</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;INLINE <span class="keywordtype">bool</span> BatteryIsCharging(<span class="keywordtype">void</span>) {</div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160; <span class="keywordflow">if</span> (!(BATTERY_PORT.IN &amp; BATTERY_STAT_PIN)) {</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160; <span class="keywordflow">return</span> <span class="keyword">true</span>;</div><div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; } <span class="keywordflow">else</span> {</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; <span class="keywordflow">return</span> <span class="keyword">false</span>;</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; }</div><div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160;}</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160;</div><div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160;<span class="preprocessor">#endif </span><span class="comment">/* BATTERY_H_ */</span><span class="preprocessor"></span></div></div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Fri Oct 23 2020 10:47:16 for Chameleon-Mini by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Thu Mar 17 2022 12:03:24 for Chameleon-Mini by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.11
</a> 1.8.13
</small></address>
</body>
</html>
51 changes: 14 additions & 37 deletions Doc/Doxygen/html/_button_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.11"/>
<meta name="generator" content="Doxygen 1.8.13"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>Chameleon-Mini: Button.h Source File</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<script type="text/javascript">
$(document).ready(function() { init_search(); });
</script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
Expand All @@ -31,40 +29,19 @@
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.8.11 -->
<!-- Generated by Doxygen 1.8.13 -->
<script type="text/javascript">
var searchBox = new SearchBox("searchBox", "search",false,'Search');
</script>
<div id="navrow1" class="tabs">
<ul class="tablist">
<li><a href="index.html"><span>Main&#160;Page</span></a></li>
<li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
<li><a href="annotated.html"><span>Classes</span></a></li>
<li class="current"><a href="files.html"><span>Files</span></a></li>
<li>
<div id="MSearchBox" class="MSearchBoxInactive">
<span class="left">
<img id="MSearchSelect" src="search/mag_sel.png"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
alt=""/>
<input type="text" id="MSearchField" value="Search" accesskey="S"
onfocus="searchBox.OnSearchFieldFocus(true)"
onblur="searchBox.OnSearchFieldFocus(false)"
onkeyup="searchBox.OnSearchFieldChange(event)"/>
</span><span class="right">
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
</span>
</div>
</li>
</ul>
</div>
<div id="navrow2" class="tabs2">
<ul class="tablist">
<li><a href="files.html"><span>File&#160;List</span></a></li>
<li><a href="globals.html"><span>File&#160;Members</span></a></li>
</ul>
</div>
<script type="text/javascript" src="menudata.js"></script>
<script type="text/javascript" src="menu.js"></script>
<script type="text/javascript">
$(function() {
initMenu('',true,false,'search.php','Search');
$(document).ready(function() { init_search(); });
});
</script>
<div id="main-nav"></div>
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
Expand Down Expand Up @@ -92,9 +69,9 @@
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment"> * Button.h</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment"> * Created on: 13.05.2013</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment"> * Author: skuser</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="preprocessor">#ifndef BUTTON_H_</span></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;<span class="preprocessor">#define BUTTON_H_</span></div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;</div><div class="line"><a name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="preprocessor">#include &quot;Common.h&quot;</span></div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno"> 13</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span> {</div><div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160; BUTTON_R_PRESS_SHORT = 0,</div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160; BUTTON_R_PRESS_LONG,</div><div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; BUTTON_L_PRESS_SHORT,</div><div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; BUTTON_L_PRESS_LONG,</div><div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160; <span class="comment">/* Must be last element */</span></div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; BUTTON_TYPE_COUNT</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160;} ButtonTypeEnum;</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span> {</div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160; BUTTON_ACTION_NONE,</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160; BUTTON_ACTION_UID_RANDOM,</div><div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; BUTTON_ACTION_UID_LEFT_INCREMENT,</div><div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; BUTTON_ACTION_UID_RIGHT_INCREMENT,</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; BUTTON_ACTION_UID_LEFT_DECREMENT,</div><div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160; BUTTON_ACTION_UID_RIGHT_DECREMENT,</div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160; BUTTON_ACTION_CYCLE_SETTINGS,</div><div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160; BUTTON_ACTION_STORE_MEM,</div><div class="line"><a name="l00032"></a><span class="lineno"> 32</span>&#160; BUTTON_ACTION_RECALL_MEM,</div><div class="line"><a name="l00033"></a><span class="lineno"> 33</span>&#160; BUTTON_ACTION_TOGGLE_FIELD,</div><div class="line"><a name="l00034"></a><span class="lineno"> 34</span>&#160; BUTTON_ACTION_STORE_LOG,</div><div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; BUTTON_ACTION_CLONE,</div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160; BUTTON_ACTION_CLONE_MFU,</div><div class="line"><a name="l00037"></a><span class="lineno"> 37</span>&#160;</div><div class="line"><a name="l00038"></a><span class="lineno"> 38</span>&#160; <span class="comment">/* This has to be last element */</span></div><div class="line"><a name="l00039"></a><span class="lineno"> 39</span>&#160; BUTTON_ACTION_COUNT</div><div class="line"><a name="l00040"></a><span class="lineno"> 40</span>&#160;} ButtonActionEnum;</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160;</div><div class="line"><a name="l00042"></a><span class="lineno"> 42</span>&#160;<span class="keywordtype">void</span> ButtonInit(<span class="keywordtype">void</span>);</div><div class="line"><a name="l00043"></a><span class="lineno"> 43</span>&#160;<span class="keywordtype">void</span> ButtonTick(<span class="keywordtype">void</span>);</div><div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160;<span class="keywordtype">void</span> ButtonGetActionList(<span class="keywordtype">char</span> *List, uint16_t BufferSize);</div><div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160;<span class="keywordtype">void</span> ButtonSetActionById(ButtonTypeEnum Type, ButtonActionEnum Action);</div><div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160;<span class="keywordtype">void</span> ButtonGetActionByName(ButtonTypeEnum Type, <span class="keywordtype">char</span> *Action, uint16_t BufferSize);</div><div class="line"><a name="l00048"></a><span class="lineno"> 48</span>&#160;<span class="keywordtype">bool</span> ButtonSetActionByName(ButtonTypeEnum Type, <span class="keyword">const</span> <span class="keywordtype">char</span> *Action);</div><div class="line"><a name="l00049"></a><span class="lineno"> 49</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno"> 50</span>&#160;<span class="preprocessor">#endif </span><span class="comment">/* BUTTON_H_ */</span><span class="preprocessor"></span></div></div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Fri Oct 23 2020 10:47:16 for Chameleon-Mini by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Thu Mar 17 2022 12:03:24 for Chameleon-Mini by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.11
</a> 1.8.13
</small></address>
</body>
</html>
Loading

0 comments on commit d29f087

Please sign in to comment.