Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Eike Ahmels committed Jul 6, 2024
2 parents b451ea3 + a1a1204 commit a770b8d
Show file tree
Hide file tree
Showing 67 changed files with 1,804 additions and 2,112 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ obj/
downloads/
tools/
.vscode
Keil_Projects/*.uvgui.*
Keil_Projects/*.uvguix.*
Keil_Projects/Objects
Keil_Projects/RTE/*
Keil_Projects/Listings
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others’ private information, such as a physical or email address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.

Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.

Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.

### 2. Warning

Community Impact: A violation through a single incident or series of actions.

Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.

### 3. Temporary Ban

Community Impact: A serious violation of community standards, including sustained inappropriate behavior.

Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

Consequence: A permanent ban from any sort of public interaction within the community.
## Attribution

This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.

Community Impact Guidelines were inspired by Mozilla’s code of conduct enforcement ladder.

For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.
100 changes: 97 additions & 3 deletions Inc/targets.h
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,43 @@
#define FILE_NAME "TEKKO32_F415"
#define DEAD_TIME 100
#define HARDWARE_GROUP_AT_D
#define HARDWARE_GROUP_AT_045
#define USE_SERIAL_TELEMETRY
#endif

#ifdef SPEEDYBEE_F421
#define FIRMWARE_NAME "SpeedyBee F4"
#define FILE_NAME "SpeedyBee_F421"
#define DEAD_TIME 100
#define HARDWARE_GROUP_AT_C
#define HARDWARE_GROUP_AT_540
#define USE_SERIAL_TELEMETRY
#endif

#ifdef MAMBA_F45_F421
#define FIRMWARE_NAME "MAMBA F45 F4"
#define FILE_NAME "MAMBA_F45_F421"
#define DEAD_TIME 100
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_504
#define USE_SERIAL_TELEMETRY
#endif

#ifdef MAMBA_F55_F421
#define FIRMWARE_NAME "MAMBA F55 F4"
#define FILE_NAME "MAMBA_F55_F421"
#define DEAD_TIME 100
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_504
#define USE_SERIAL_TELEMETRY
#endif

#ifdef MAMBA_F65_F421
#define FIRMWARE_NAME "MAMBA F65 F4"
#define FILE_NAME "MAMBA_F65_F421"
#define DEAD_TIME 100
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_504
#define USE_SERIAL_TELEMETRY
#endif

Expand Down Expand Up @@ -1071,6 +1108,27 @@
#define USE_LED_STRIP
#endif

#ifdef MAMBA_S80_12S_G071
#define FILE_NAME "MAMBA_S80_12S_G071"
#define FIRMWARE_NAME "MAMBA S80 "
#define DEAD_TIME 60
#define MILLIVOLT_PER_AMP 10
#define CURRENT_OFFSET 0
#define TARGET_STALL_PROTECTION_INTERVAL 9000
#define TARGET_VOLTAGE_DIVIDER 110
#define HARDWARE_GROUP_G0_J
#define USE_SERIAL_TELEMETRY
#define SIXTY_FOUR_KB_MEMORY

#define VOLTAGE_ADC_PIN LL_GPIO_PIN_1
#define VOLTAGE_ADC_CHANNEL LL_ADC_CHANNEL_1

#define CURRENT_ADC_PIN LL_GPIO_PIN_5
#define CURRENT_ADC_CHANNEL LL_ADC_CHANNEL_5

#define USE_LED_STRIP
#endif

#ifdef HAKRC_2023_G071
#define FILE_NAME "HAKRC_2023_G071"
#define FIRMWARE_NAME "HAKRC G0_23 "
Expand Down Expand Up @@ -1957,6 +2015,42 @@

#endif


#ifdef HARDWARE_GROUP_G0_J

#define MCU_G071
#define USE_TIMER_3_CHANNEL_1
#define INPUT_PIN LL_GPIO_PIN_4
#define INPUT_PIN_PORT GPIOB
#define IC_TIMER_CHANNEL LL_TIM_CHANNEL_CH1
#define IC_TIMER_REGISTER TIM3
#define IC_TIMER_POINTER htim3

#define INPUT_DMA_CHANNEL LL_DMA_CHANNEL_1
#define DMA_HANDLE_TYPE_DEF hdma_tim3_ch1
#define IC_DMA_IRQ_NAME DMA1_Channel1_IRQn

#define PHASE_A_GPIO_LOW LL_GPIO_PIN_1
#define PHASE_A_GPIO_PORT_LOW GPIOB
#define PHASE_A_GPIO_HIGH LL_GPIO_PIN_12
#define PHASE_A_GPIO_PORT_HIGH GPIOA

#define PHASE_B_GPIO_LOW LL_GPIO_PIN_0
#define PHASE_B_GPIO_PORT_LOW GPIOB
#define PHASE_B_GPIO_HIGH LL_GPIO_PIN_11
#define PHASE_B_GPIO_PORT_HIGH GPIOA

#define PHASE_C_GPIO_LOW LL_GPIO_PIN_7
#define PHASE_C_GPIO_PORT_LOW GPIOA
#define PHASE_C_GPIO_HIGH LL_GPIO_PIN_8
#define PHASE_C_GPIO_PORT_HIGH GPIOA

#define PHASE_A_COMP LL_COMP_INPUT_MINUS_IO1 // pb3
#define PHASE_B_COMP LL_COMP_INPUT_MINUS_IO2 // pb7
#define PHASE_C_COMP LL_COMP_INPUT_MINUS_IO3 // pa2

#endif

#ifdef HARDWARE_GROUP_G4_A

#define MCU_G431
Expand Down Expand Up @@ -2310,9 +2404,9 @@
// #define PHASE_B_COMP COMP_INMInput_IN1 // pa4
// #define PHASE_C_COMP COMP_INMInput_IN2 // pa5

#define PHASE_A_COMP 0x400000E1 // works for polling mode
#define PHASE_B_COMP 0x400000C1
#define PHASE_C_COMP 0x400000D1
//#define PHASE_A_COMP 0x400000E1 // works for polling mode
//#define PHASE_B_COMP 0x400000C1
//#define PHASE_C_COMP 0x400000D1

#endif

Expand Down
3 changes: 2 additions & 1 deletion Keil_Projects/AM32_MultiProject.uvmpw
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<Header>### uVision Project, (C) Keil Software</Header>

<WorkspaceName>WorkSpace</WorkspaceName>
<WorkspaceName>E:\NextCloud\dev\am32\Keil_Projects\AM32_MultiProject.uvmpw</WorkspaceName>

<project>
<PathAndName>.\Am32e230.uvprojx</PathAndName>
Expand All @@ -29,6 +29,7 @@

<project>
<PathAndName>.\Am32F421.uvprojx</PathAndName>
<NodeIsActive>1</NodeIsActive>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>

Expand Down
Loading

0 comments on commit a770b8d

Please sign in to comment.