Skip to content

Commit

Permalink
Merge pull request #53 from am32-firmware/Kiss_Ardupilot_DshotBranch
Browse files Browse the repository at this point in the history
Kiss ardupilot dshot branch
  • Loading branch information
freasy authored Aug 4, 2024
2 parents 976462f + 9e76184 commit 485820e
Show file tree
Hide file tree
Showing 2,142 changed files with 552,446 additions and 746,712 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/CI_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI Build Linux

on: [push, pull_request]

jobs:
build:
runs-on: 'ubuntu-latest'

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Build CI
run: |
make arm_sdk_install
make -j8
- name: Archive build
uses: actions/upload-artifact@v3
with:
name: AM32-binaries
path: |
obj/*.hex
retention-days: 7
25 changes: 25 additions & 0 deletions .github/workflows/CI_build_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI Build Windows

on: [push, pull_request]

jobs:
build:
runs-on: 'windows-latest'

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Build CI
run: |
make arm_sdk_install
tools/windows/make/bin/make
- name: Archive build
uses: actions/upload-artifact@v3
with:
name: AM32-binaries
path: |
obj/*.hex
retention-days: 7
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ Keil_Projects/*.uvguix.*
Keil_Projects/Objects
Keil_Projects/RTE/*
Keil_Projects/Listings
*.bin
*.elf
*.d
*.hex
*.log
*~
49 changes: 49 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
// STLink configuration
{
"name": "AM32 STLink",
"cwd": "${workspaceFolder}",
"executable": "${workspaceFolder}/obj/debug.elf",
"liveWatch": {
"enabled": true,
"samplesPerSecond": 4,
},
"request": "launch",
"type": "cortex-debug",
"servertype": "openocd",
"configFiles": [
"${workspaceFolder}/obj/openocd.cfg",
],
"showDevDebugOutput": "none",

"serverpath": "${workspaceFolder}${/}tools${/}${config:OS}${/}openocd${/}bin${/}openocd",
"armToolchainPath": "${workspaceRoot}/tools/${config:OS}/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin",
},

// JLink configuration
{
"type": "cortex-debug",
"request": "launch",
"name": "AM32 JLink",
"cwd": "${workspaceRoot}",
"device" : "-AT32F421K8U7",
"gdbPath": "${workspaceRoot}/tools/${config:OS}/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin/arm-none-eabi-gdb",
"executable": "${workspaceRoot}/obj/debug.elf",
"showDevDebugOutput": "raw",
"servertype" : "jlink",
"swoConfig": {
"enabled": false,
},
"serialNumber": "",
"liveWatch": {
"enabled": true,
"samplesPerSecond": 4
}
}
]
}
27 changes: 27 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"OS": "windows",
"makefile.makePath": "tools/windows/make/bin/make.exe",

//"OS": "linux",
//"makefile.makePath": "/usr/bin/make",

"makefile.configurations": [
{
"name": "MakeSingle",
"makeArgs": [
"-j1"
]
},
{
"name": "MakeParallel-8",
"makeArgs": [
"-j8"
]
},
{
"name": "MakeParallel-MAX",
"makeArgs": [
"-j"
]
}
}
2 changes: 2 additions & 0 deletions Inc/common.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once


extern uint32_t eeprom_address;
extern uint8_t eepromBuffer[176];
extern uint16_t TIMER1_MAX_ARR;
extern uint16_t dshot_frametime_high;
Expand Down
2 changes: 1 addition & 1 deletion Inc/dshot.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern char dir_reversed;
extern char bi_direction;
extern char buffer_divider;
extern uint8_t last_dshot_command;
extern uint16_t commutation_interval;
extern uint32_t commutation_interval;

// int e_com_time;

Expand Down
Loading

0 comments on commit 485820e

Please sign in to comment.