Skip to content

Commit

Permalink
Merge branch 'release-candidate' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
skotopes committed Aug 17, 2021
2 parents 073c87f + 129031e commit b629ae1
Show file tree
Hide file tree
Showing 339 changed files with 8,416 additions and 5,786 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ jobs:
do
hex2dfu \
-i bootloader/.obj/${TARGET}/bootloader.hex \
-o bootloader/.obj/${TARGET}/bootloader.dfu
-o bootloader/.obj/${TARGET}/bootloader.dfu \
-l "Flipper Zero $(echo $TARGET | tr a-z A-Z)"
done
- name: 'Build firmware in docker'
Expand All @@ -86,7 +87,8 @@ jobs:
do
hex2dfu \
-i firmware/.obj/${TARGET}/firmware.hex \
-o firmware/.obj/${TARGET}/firmware.dfu
-o firmware/.obj/${TARGET}/firmware.dfu \
-l "Flipper Zero $(echo $TARGET | tr a-z A-Z)"
done
- name: 'Generate full hex file'
Expand Down Expand Up @@ -129,7 +131,8 @@ jobs:
do
hex2dfu \
-i firmware/.obj/${TARGET}/full.hex \
-o artifacts/flipper-z-${TARGET}-full-${SUFFIX}.dfu
-o artifacts/flipper-z-${TARGET}-full-${SUFFIX}.dfu \
-l "Flipper Zero $(echo $TARGET | tr a-z A-Z)"
done
- name: 'Full flash asssembly: bootloader as base'
Expand Down Expand Up @@ -157,14 +160,6 @@ jobs:
>> artifacts/flipper-z-${TARGET}-full-${SUFFIX}.bin
done
- name: 'Publish artifacts'
uses: actions/upload-artifact@v2
with:
name: artifacts
path: artifacts/*
if-no-files-found: error
retention-days: 7

- name: 'Upload artifacts to update server'
uses: burnett01/rsync-deployments@4.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_c.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Lint C/C++ with clang-format'

on: push
on: pull_request

env:
TARGETS: f6
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/lint_python.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: 'Python Lint'

on:
push:
paths:
- '**.py'
pull_request:
on: pull_request

jobs:
lint_python:
Expand Down
64 changes: 64 additions & 0 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,67 @@ One liner: `./flash_core1_main.sh`
* Project website: [flipperzero.one](https://flipperzero.one)
* Kickstarter page: [kickstarter.com](https://www.kickstarter.com/projects/flipper-devices/flipper-zero-tamagochi-for-hackers)
* Forum: [forum.flipperzero.one](https://forum.flipperzero.one/)

# Folders structure

- applications - application and services
* accessor - Wiegand server
* archive - Archive and file manager
* bt - BLE service and application
* cli - Console service
* debug_tools - different tools that we use on factory and for debug
* dialogs - service for showing GUI dialogs
* dolphin - dolphin service and supplientary apps
* gpio-tester - GPIO control application
* gui - GUI service
* ibutton - ibutton application, onewire keys and more
* input - input service
* irda - irda application, controls your IR devices
* irda_monitor - irda debug tool
* lfrfid - LF RFID application
* lfrfid-debug - LF RFID debug tool
* loader - application loader service
* menu - main menu service
* music-player - music player app (demo)
* nfc - NFC application, HF rfid, EMV and etc
* notification - notification service
* power - power service
* power-observer - power debug tool
* scened-app-example - c++ application example
* storage - storage service, internal + sdcard
* storage-settings - storage settings app
* subghz - subghz application, 433 fobs and etc
* tests - unit tests and etc
- assets - assets used by applications and services
* compiled - compilation results
* icons - source icons images
- bootloader - bootloader for flipper
* src - bootloader sources
* targets - targets' hal and implementation
- core - core libraries: home for furi
- debug - debug helpers, plugins and tools
- docker - docker image sources (used for automated firmware build)
- firmware - firmware for flipper
* targets - targets' hal and implementation
- lib - different libraries and drivers that apps and firmware uses
* ST25RFAL002 - ST253916 driver and NFC hal
* STM32CubeWB - STM32WB hal
* app-scened-template - scened template app library
* app-template - template app library
* callback-connector - callback connector library
* common-api - common api delaration library
* cyfral - cyfral library
* drivers - drivers that we wrote
* fatfs - external storage file system
* fnv1a-hash - fnv1a hash library
* irda - irda library
* littlefs - internal storage file system
* mlib - algorithms and containers
* nfc_protocols - nfc protocols library
* onewire - one wire library
* qrcode - qr code generator library
* subghz - subghz library
* toolbox - toolbox of things that we are using but don't place in core
* u8g2 - graphics library that we use to draw GUI
- make - make helpers
- scripts - supplimentary scripts
10 changes: 5 additions & 5 deletions applications/accessor/accessor-app.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "accessor-app.h"
#include <furi.h>
#include <api-hal.h>
#include <furi-hal.h>
#include <stdarg.h>

void AccessorApp::run(void) {
Expand Down Expand Up @@ -33,16 +33,16 @@ void AccessorApp::run(void) {

AccessorApp::AccessorApp()
: onewire_master{&ibutton_gpio} {
api_hal_power_insomnia_enter();
furi_hal_power_insomnia_enter();
notification = static_cast<NotificationApp*>(furi_record_open("notification"));
notify_init();
api_hal_power_enable_otg();
furi_hal_power_enable_otg();
}

AccessorApp::~AccessorApp() {
api_hal_power_disable_otg();
furi_hal_power_disable_otg();
furi_record_close("notification");
api_hal_power_insomnia_exit();
furi_hal_power_insomnia_exit();
}

AccessorAppViewManager* AccessorApp::get_view_manager() {
Expand Down
2 changes: 1 addition & 1 deletion applications/accessor/accessor.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "accessor-app.h"

// app enter function
extern "C" int32_t app_accessor(void* p) {
extern "C" int32_t accessor_app(void* p) {
AccessorApp* app = new AccessorApp();
app->run();
delete app;
Expand Down
2 changes: 1 addition & 1 deletion applications/accessor/helpers/wiegand.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "wiegand.h"
#include <furi.h>
#include <api-hal.h>
#include <furi-hal.h>

volatile unsigned long WIEGAND::_cardTempHigh = 0;
volatile unsigned long WIEGAND::_cardTemp = 0;
Expand Down
Loading

0 comments on commit b629ae1

Please sign in to comment.