Skip to content

changes for my own setup #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MS-Astra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

changes for my own setup #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0194f00
changes for my own setup
Feb 14, 2021
a496c78
fix remapping
Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Project/application_code/Loxone/CAN Driver/LoxCANDriver_STM32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <__cross_studio_io.h>
#include <string.h>

#define CAN_GPIO_PORT GPIOB
#define CAN_RX_GPIO_PIN GPIO_PIN_8
#define CAN_TX_GPIO_PIN GPIO_PIN_9
#define CAN_GPIO_PORT GPIOA
#define CAN_RX_GPIO_PIN GPIO_PIN_11
#define CAN_TX_GPIO_PIN GPIO_PIN_12

static CAN_HandleTypeDef gCan;
static LoxCANDriver_STM32 *gCANDriver;
Expand Down Expand Up @@ -251,7 +251,7 @@ extern "C" void HAL_CAN_MspInit(CAN_HandleTypeDef *hcan) {
if (hcan->Instance == CAN1) {

__HAL_RCC_CAN1_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOA_CLK_ENABLE();

GPIO_InitTypeDef gpioRX = {
.Pin = CAN_RX_GPIO_PIN,
Expand All @@ -266,7 +266,7 @@ extern "C" void HAL_CAN_MspInit(CAN_HandleTypeDef *hcan) {
};
HAL_GPIO_Init(CAN_GPIO_PORT, &gpioTX);

__HAL_AFIO_REMAP_CAN1_2();
__HAL_AFIO_REMAP_CAN1_1();

// interrupt init for CAN
HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 0, 0);
Expand Down
26 changes: 13 additions & 13 deletions Project/application_code/Loxone/LED.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ LED gLED;
static void LED_on_off(eLED_color color) {
switch (color) {
case eLED_green: // right LED on
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_13, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_0, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
break;
case eLED_orange: // left LED on
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_13, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_SET);
break;
case eLED_red: // both LEDs on
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_13, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_0, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_RESET);
break;
default: // both LEDs off
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_13, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_14, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_0, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_1, GPIO_PIN_SET);
}
}

Expand Down Expand Up @@ -92,21 +92,21 @@ void LED::vLEDTask(void *pvParameters) {
}

void LED::Startup(void) {
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOE_CLK_ENABLE();

GPIO_InitTypeDef GPIO_Init;
// 2 LEDs as outputs
GPIO_Init.Pin = GPIO_PIN_13 | GPIO_PIN_14;
GPIO_Init.Pin = GPIO_PIN_0 | GPIO_PIN_1;
GPIO_Init.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_Init.Pull = GPIO_NOPULL;
GPIO_Init.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOB, &GPIO_Init);
HAL_GPIO_Init(GPIOE, &GPIO_Init);

// 2 buttons as inputs
GPIO_Init.Pin = GPIO_PIN_1 | GPIO_PIN_15;
GPIO_Init.Pin = GPIO_PIN_4 | GPIO_PIN_5;
GPIO_Init.Mode = GPIO_MODE_INPUT;
GPIO_Init.Pull = GPIO_PULLDOWN;
HAL_GPIO_Init(GPIOB, &GPIO_Init);
HAL_GPIO_Init(GPIOC, &GPIO_Init);

#define STACKSIZE 128
static unsigned stack[1+STACKSIZE+1];
Expand Down
2 changes: 1 addition & 1 deletion Project/application_code/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main(void) {
#if EXTENSION_MODBUS
// static LoxLegacyModbusExtension gLoxLegacyModbusExtension(gLoxCANDriver, serial_base);
#endif
static LoxBusDIExtension gDIExtension(gLoxCANDriver, serial_base, gResetReason);
//static LoxBusDIExtension gDIExtension(gLoxCANDriver, serial_base, gResetReason);
static LoxLegacyRelayExtension gRelayExtension(gLoxCANDriver, serial_base);
//static LoxLegacyDMXExtension gDMXExtension(gLoxCANDriver, serial_base);
//static LoxBusTreeExtension gTreeExtension(gLoxCANDriver, serial_base, gResetReason);
Expand Down