Compare commits
13 Commits
simplify_b
...
all-contri
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f4b729ee14 | ||
![]() |
74a782c3f4 | ||
![]() |
975cdf02f2 | ||
![]() |
21f3a0d10f | ||
![]() |
b535b41d92 | ||
![]() |
fd32cc0761 | ||
![]() |
78dd2a10d3 | ||
![]() |
fa1bb0dce5 | ||
![]() |
169dfd2f0d | ||
![]() |
dafd974d93 | ||
![]() |
712fde6858 | ||
![]() |
fcc2e86a6d | ||
![]() |
8b146c4a16 |
@@ -197,6 +197,27 @@
|
|||||||
"code",
|
"code",
|
||||||
"doc"
|
"doc"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"login": "ccinelli",
|
||||||
|
"name": "ccinelli",
|
||||||
|
"avatar_url": "https://avatars0.githubusercontent.com/u/38021940?v=4",
|
||||||
|
"profile": "https://github.com/ccinelli",
|
||||||
|
"contributions": [
|
||||||
|
"infra",
|
||||||
|
"test"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"login": "Nitrokey",
|
||||||
|
"name": "Nitrokey",
|
||||||
|
"avatar_url": "https://avatars1.githubusercontent.com/u/9438831?v=4",
|
||||||
|
"profile": "https://www.nitrokey.com",
|
||||||
|
"contributions": [
|
||||||
|
"code",
|
||||||
|
"test",
|
||||||
|
"ideas"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"contributorsPerLine": 7,
|
"contributorsPerLine": 7,
|
||||||
|
@@ -166,6 +166,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|||||||
<td align="center"><a href="http://www.schulz.dk"><img src="https://avatars1.githubusercontent.com/u/1150049?v=4" width="100px;" alt="Kim Schulz"/><br /><sub><b>Kim Schulz</b></sub></a><br /><a href="#business-kimusan" title="Business development">💼</a> <a href="#ideas-kimusan" title="Ideas, Planning, & Feedback">🤔</a></td>
|
<td align="center"><a href="http://www.schulz.dk"><img src="https://avatars1.githubusercontent.com/u/1150049?v=4" width="100px;" alt="Kim Schulz"/><br /><sub><b>Kim Schulz</b></sub></a><br /><a href="#business-kimusan" title="Business development">💼</a> <a href="#ideas-kimusan" title="Ideas, Planning, & Feedback">🤔</a></td>
|
||||||
<td align="center"><a href="https://github.com/oplik0"><img src="https://avatars2.githubusercontent.com/u/25460763?v=4" width="100px;" alt="Jakub"/><br /><sub><b>Jakub</b></sub></a><br /><a href="https://github.com/solokeys/solo/issues?q=author%3Aoplik0" title="Bug reports">🐛</a></td>
|
<td align="center"><a href="https://github.com/oplik0"><img src="https://avatars2.githubusercontent.com/u/25460763?v=4" width="100px;" alt="Jakub"/><br /><sub><b>Jakub</b></sub></a><br /><a href="https://github.com/solokeys/solo/issues?q=author%3Aoplik0" title="Bug reports">🐛</a></td>
|
||||||
<td align="center"><a href="https://github.com/jolo1581"><img src="https://avatars1.githubusercontent.com/u/53423977?v=4" width="100px;" alt="Jan A."/><br /><sub><b>Jan A.</b></sub></a><br /><a href="https://github.com/solokeys/solo/commits?author=jolo1581" title="Code">💻</a> <a href="https://github.com/solokeys/solo/commits?author=jolo1581" title="Documentation">📖</a></td>
|
<td align="center"><a href="https://github.com/jolo1581"><img src="https://avatars1.githubusercontent.com/u/53423977?v=4" width="100px;" alt="Jan A."/><br /><sub><b>Jan A.</b></sub></a><br /><a href="https://github.com/solokeys/solo/commits?author=jolo1581" title="Code">💻</a> <a href="https://github.com/solokeys/solo/commits?author=jolo1581" title="Documentation">📖</a></td>
|
||||||
|
<td align="center"><a href="https://github.com/ccinelli"><img src="https://avatars0.githubusercontent.com/u/38021940?v=4" width="100px;" alt="ccinelli"/><br /><sub><b>ccinelli</b></sub></a><br /><a href="#infra-ccinelli" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/solokeys/solo/commits?author=ccinelli" title="Tests">⚠️</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td align="center"><a href="https://www.nitrokey.com"><img src="https://avatars1.githubusercontent.com/u/9438831?v=4" width="100px;" alt="Nitrokey"/><br /><sub><b>Nitrokey</b></sub></a><br /><a href="https://github.com/solokeys/solo/commits?author=Nitrokey" title="Code">💻</a> <a href="https://github.com/solokeys/solo/commits?author=Nitrokey" title="Tests">⚠️</a> <a href="#ideas-Nitrokey" title="Ideas, Planning, & Feedback">🤔</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
@@ -199,7 +203,7 @@ You can buy Solo, Solo Tap, and Solo for Hackers at [solokeys.com](https://solok
|
|||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
[](https://github.com/solokeys/solo/blob/master/LICENSE)
|
[](https://github.com/solokeys/solo/blob/master/LICENSE)
|
||||||
[](#contributors)
|
[](#contributors)
|
||||||
[](https://travis-ci.com/solokeys/solo)
|
[](https://travis-ci.com/solokeys/solo)
|
||||||
[](https://discourse.solokeys.com)
|
[](https://discourse.solokeys.com)
|
||||||
[](https://keybase.io/team/solokeys.public)
|
[](https://keybase.io/team/solokeys.public)
|
||||||
|
@@ -1 +1 @@
|
|||||||
2.5.3
|
3.0.0
|
||||||
|
@@ -46,9 +46,7 @@ int main()
|
|||||||
{
|
{
|
||||||
uint8_t hidmsg[64];
|
uint8_t hidmsg[64];
|
||||||
uint32_t t1 = 0;
|
uint32_t t1 = 0;
|
||||||
#ifdef SOLO_HACKER
|
|
||||||
uint32_t stboot_time = 0;
|
uint32_t stboot_time = 0;
|
||||||
#endif
|
|
||||||
uint32_t boot = 1;
|
uint32_t boot = 1;
|
||||||
|
|
||||||
set_logging_mask(
|
set_logging_mask(
|
||||||
@@ -98,7 +96,6 @@ int main()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef SOLO_HACKER
|
|
||||||
if (!is_bootloader_disabled())
|
if (!is_bootloader_disabled())
|
||||||
{
|
{
|
||||||
stboot_time = millis();
|
stboot_time = millis();
|
||||||
@@ -108,7 +105,6 @@ int main()
|
|||||||
goto start_bootloader;
|
goto start_bootloader;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
|
if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
|
||||||
{
|
{
|
||||||
@@ -119,9 +115,8 @@ int main()
|
|||||||
|
|
||||||
printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
|
printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
|
||||||
}
|
}
|
||||||
#ifdef SOLO_HACKER
|
|
||||||
start_bootloader:
|
start_bootloader:
|
||||||
#endif
|
|
||||||
SystemClock_Config();
|
SystemClock_Config();
|
||||||
init_gpio();
|
init_gpio();
|
||||||
init_millisecond_timer(0);
|
init_millisecond_timer(0);
|
||||||
|
Reference in New Issue
Block a user