From 06d3375ea3662981765d5d5ff76ef5dd85e90927 Mon Sep 17 00:00:00 2001 From: Mateusz Lubecki Date: Fri, 30 Jun 2023 23:01:36 +0200 Subject: [PATCH] daily --- .cproject | 24 +++++++-------- STM32L476_ParaMETEO/makefile | 2 +- STM32L476_ParaMETEO/sources.mk | 2 +- include/PathConfig.h | 2 +- include/aprsis.h | 2 +- include/button.h | 2 +- include/etc/kiss_did_configuration.h | 6 ++-- .../kiss_communication_nrc_t.h | 14 +++++++++ include/main.h | 2 +- include/packet_tx_handler.h | 2 +- include/pwr_save.h | 2 +- .../config_data.h | 0 .../config_data_externs.h | 2 +- .../configuration_handler.h | 6 ++-- include/wx_handler.h | 2 +- include/wx_handler_humidity.h | 2 +- include/wx_handler_pressure.h | 2 +- include/wx_handler_temperature.h | 2 +- src/it_handlers.c | 2 +- src/kiss_protocol/kiss_callback.c | 20 ++++++++----- src/kiss_protocol/kiss_communication.c | 16 ++++++++-- src/kiss_protocol/kiss_did.c | 20 ++++++++++++- src/main.c | 4 +-- .../config_data_default.c | 2 +- .../config_data_first.c | 2 +- .../config_data_second.c | 2 +- .../configuration_handler.c | 29 +++++++++---------- system/include/aprs/digi.h | 2 +- system/include/aprs/telemetry.h | 2 +- system/include/drivers/max31865.h | 2 +- system/include/gsm/sim800c_gprs.h | 2 +- system/include/gsm/sim800c_poolers.h | 2 +- system/include/modbus_rtu/rtu_getters.h | 2 +- system/include/modbus_rtu/rtu_serial_io.h | 2 +- .../umb_master/umb_0x23_offline_data.h | 2 +- system/include/umb_master/umb_0x26_status.h | 2 +- system/include/umb_master/umb_channel_pool.h | 2 +- system/include/umb_master/umb_master.h | 2 +- system/src/umb_master/umb_0x26_status.c | 2 +- 39 files changed, 123 insertions(+), 74 deletions(-) rename include/{configuration_nvm => stored_configuration_nvm}/config_data.h (100%) rename include/{configuration_nvm => stored_configuration_nvm}/config_data_externs.h (97%) rename include/{configuration_nvm => stored_configuration_nvm}/configuration_handler.h (90%) rename src/{configuration_nvm => stored_configuration_nvm}/config_data_default.c (99%) rename src/{configuration_nvm => stored_configuration_nvm}/config_data_first.c (99%) rename src/{configuration_nvm => stored_configuration_nvm}/config_data_second.c (99%) rename src/{configuration_nvm => stored_configuration_nvm}/configuration_handler.c (97%) diff --git a/.cproject b/.cproject index 61f053e..ce43bdd 100644 --- a/.cproject +++ b/.cproject @@ -86,7 +86,7 @@ @@ -220,8 +220,8 @@ - - + + @@ -503,8 +503,8 @@ - - + + @@ -562,16 +562,10 @@ - - - - - - - + @@ -580,5 +574,11 @@ + + + + + + \ No newline at end of file diff --git a/STM32L476_ParaMETEO/makefile b/STM32L476_ParaMETEO/makefile index 36938a2..f218faa 100644 --- a/STM32L476_ParaMETEO/makefile +++ b/STM32L476_ParaMETEO/makefile @@ -24,8 +24,8 @@ RM := rm -rf -include system/src/cmsis/stm32l4xx/subdir.mk -include system/src/aprs/subdir.mk -include system/src/subdir.mk +-include src/stored_configuration_nvm/subdir.mk -include src/kiss_protocol/subdir.mk --include src/configuration_nvm/subdir.mk -include src/subdir.mk -include subdir.mk -include objects.mk diff --git a/STM32L476_ParaMETEO/sources.mk b/STM32L476_ParaMETEO/sources.mk index 0deb3d0..581599e 100644 --- a/STM32L476_ParaMETEO/sources.mk +++ b/STM32L476_ParaMETEO/sources.mk @@ -28,8 +28,8 @@ CPP_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ src \ -src/configuration_nvm \ src/kiss_protocol \ +src/stored_configuration_nvm \ system/src/aprs \ system/src/cmsis/stm32l4xx \ system/src \ diff --git a/include/PathConfig.h b/include/PathConfig.h index b17c8aa..34a16b0 100644 --- a/include/PathConfig.h +++ b/include/PathConfig.h @@ -8,8 +8,8 @@ #ifndef PATH_H_ #define PATH_H_ +#include #include "aprs/ax25.h" -#include "config_data.h" /* C++ detection */ #ifdef __cplusplus diff --git a/include/aprsis.h b/include/aprsis.h index 75d57ed..4a51bde 100644 --- a/include/aprsis.h +++ b/include/aprsis.h @@ -8,10 +8,10 @@ #ifndef APRSIS_H_ #define APRSIS_H_ +#include #include "drivers/serial.h" #include "gsm/sim800c_tcpip.h" #include "ax25.h" -#include "config_data.h" typedef enum aprsis_return { diff --git a/include/button.h b/include/button.h index c52aa4c..b57cc41 100644 --- a/include/button.h +++ b/include/button.h @@ -11,7 +11,7 @@ #ifndef BUTTON_H_ #define BUTTON_H_ -#include "configuration_handler.h" +#include /** * Should be called from main for loop or in quite short interval, like diff --git a/include/etc/kiss_did_configuration.h b/include/etc/kiss_did_configuration.h index e7ed6fc..9ab0235 100644 --- a/include/etc/kiss_did_configuration.h +++ b/include/etc/kiss_did_configuration.h @@ -28,14 +28,14 @@ extern char did_dummy_data; //!< Definition of all DIDs with theirs source data for PARAMETEO platform #if defined(PARAMETEO) #define DIDS_NUMERIC(ENTRY) \ - ENTRY(0x1234, &rte_wx_temperature_average_dallas, &rte_wx_temperature_average_pt, &rte_wx_temperature_average_internal) \ - ENTRY(0xFFFF, &did_dummy_data, &did_dummy_data, &did_dummy_data) + ENTRY(0x1234U, &rte_wx_temperature_average_dallas, &rte_wx_temperature_average_pt, &rte_wx_temperature_average_internal) \ + ENTRY(0xFFFFU, &did_dummy_data, &did_dummy_data, &did_dummy_data) #endif //!< Definition of all DIDs with theirs source data for PARATNC platform #if defined (PARATNC) #define DIDS_NUMERIC(ENTRY) \ - ENTRY(0xFFFF, &did_dummy_data, &did_dummy_data, &did_dummy_data) + ENTRY(0xFFFFU, &did_dummy_data, &did_dummy_data, &did_dummy_data) #endif #endif /* KISS_DID_CONFIGURATION_H_ */ diff --git a/include/kiss_communication/kiss_communication_nrc_t.h b/include/kiss_communication/kiss_communication_nrc_t.h index 7ba0eb2..86642ff 100644 --- a/include/kiss_communication/kiss_communication_nrc_t.h +++ b/include/kiss_communication/kiss_communication_nrc_t.h @@ -10,6 +10,7 @@ #ifndef KISS_COMMUNICATION_KISS_COMMUNICATION_NRC_T_H_ #define KISS_COMMUNICATION_KISS_COMMUNICATION_NRC_T_H_ +#define KISS_COMMUNICATION_NRC_SERVICE 0x74U typedef enum kiss_communication_nrc_t { NRC_POSITIVE = 0x00, @@ -124,6 +125,19 @@ typedef enum kiss_communication_nrc_t { */ NRC_EXCEED_NUMBER_OF_ATTEMPTS = 0x36, + /** + * This response code indicates that an attempt to upload/download to + * a server's memory cannot be accomplished due to some fault conditions. + */ + NRC_UPLOAD_DOWNLOAD_NOT_ACCEPTED = 0x70, + + /** + * This response code indicates that the server detected an error when + * erasing or programming a memory location in the permanent memory + * device (e.g. Flash Memory). + */ + NRC_GENERAL_PROGRAMMING_FAIL = 0x72, + /** * This response code indicates that the request message was received * correctly, and that all parameters in the request message were valid, diff --git a/include/main.h b/include/main.h index e359ca1..3590740 100644 --- a/include/main.h +++ b/include/main.h @@ -1,13 +1,13 @@ #ifndef MAIN_H_ #define MAIN_H_ +#include #include "main_master_time.h" #include "station_config_target_hw.h" #include "aprs/ax25.h" #include "drivers/serial.h" -#include "config_data.h" #include "gsm/sim800_state_t.h" #define SW_VER "EA23" diff --git a/include/packet_tx_handler.h b/include/packet_tx_handler.h index 36cfd72..ba820a5 100644 --- a/include/packet_tx_handler.h +++ b/include/packet_tx_handler.h @@ -8,7 +8,7 @@ #ifndef PACKET_TX_HANDLER_H_ #define PACKET_TX_HANDLER_H_ -#include "config_data.h" +#include typedef struct packet_tx_counter_values_t { diff --git a/include/pwr_save.h b/include/pwr_save.h index 3883ff1..2df8f73 100644 --- a/include/pwr_save.h +++ b/include/pwr_save.h @@ -8,6 +8,7 @@ #ifndef PWR_SAVE_H_ #define PWR_SAVE_H_ +#include #include "station_config_target_hw.h" /** @@ -102,7 +103,6 @@ * */ -#include "config_data.h" #define CURRENTLY_CUTOFF 0x1 #define CURRENTLY_VBATT_LOW 0x8 diff --git a/include/configuration_nvm/config_data.h b/include/stored_configuration_nvm/config_data.h similarity index 100% rename from include/configuration_nvm/config_data.h rename to include/stored_configuration_nvm/config_data.h diff --git a/include/configuration_nvm/config_data_externs.h b/include/stored_configuration_nvm/config_data_externs.h similarity index 97% rename from include/configuration_nvm/config_data_externs.h rename to include/stored_configuration_nvm/config_data_externs.h index 047b893..0779915 100644 --- a/include/configuration_nvm/config_data_externs.h +++ b/include/stored_configuration_nvm/config_data_externs.h @@ -8,7 +8,7 @@ #ifndef CONFIG_DATA_EXTERNS_H_ #define CONFIG_DATA_EXTERNS_H_ -#include "config_data.h" +#include extern const int __config_section_first_crc; extern const int __config_section_second_crc; diff --git a/include/configuration_nvm/configuration_handler.h b/include/stored_configuration_nvm/configuration_handler.h similarity index 90% rename from include/configuration_nvm/configuration_handler.h rename to include/stored_configuration_nvm/configuration_handler.h index 2a52c90..d618d6a 100644 --- a/include/configuration_nvm/configuration_handler.h +++ b/include/stored_configuration_nvm/configuration_handler.h @@ -9,6 +9,8 @@ #define CONFIGURATION_HANDLER_H_ #include +#include "kiss_communication_nrc_t.h" + typedef enum configuration_handler_region_t { REGION_DEFAULT, @@ -39,8 +41,8 @@ uint32_t configuration_handler_check_crc(void); uint32_t configuration_handler_restore_default_first(void); uint32_t configuration_handler_restore_default_second(void); void configuration_handler_load_configuration(configuration_handler_region_t region); -configuration_erase_startup_t configuration_handler_erase_startup(void); -configuration_erase_startup_t configuration_handler_program_startup(uint8_t * data, uint8_t dataln, uint16_t offset); +kiss_communication_nrc_t configuration_handler_erase_startup(void); +kiss_communication_nrc_t configuration_handler_program_startup(uint8_t * data, uint8_t dataln, uint16_t offset); uint32_t configuration_get_register(void); void configuration_set_register(uint32_t value); diff --git a/include/wx_handler.h b/include/wx_handler.h index f7b9822..8232beb 100644 --- a/include/wx_handler.h +++ b/include/wx_handler.h @@ -9,7 +9,7 @@ #define WX_HANDLER_H_ #include -#include "config_data.h" +#include extern uint32_t wx_last_good_temperature_time; extern uint32_t wx_last_good_wind_time; diff --git a/include/wx_handler_humidity.h b/include/wx_handler_humidity.h index f22805b..f0f216e 100644 --- a/include/wx_handler_humidity.h +++ b/include/wx_handler_humidity.h @@ -8,7 +8,7 @@ #ifndef WX_HANDLER_HUMIDITY_H_ #define WX_HANDLER_HUMIDITY_H_ -#include "config_data.h" +#include int32_t wx_get_humidity_measurement(const config_data_wx_sources_t * const config_sources, const config_data_mode_t * const config_mode, const config_data_umb_t * const config_umb, const config_data_rtu_t * const config_rtu); int32_t wx_get_humidity_bme280(int8_t * const humidity); diff --git a/include/wx_handler_pressure.h b/include/wx_handler_pressure.h index 27c2333..92a2d14 100644 --- a/include/wx_handler_pressure.h +++ b/include/wx_handler_pressure.h @@ -8,7 +8,7 @@ #ifndef WX_HANDLER_PRESSURE_H_ #define WX_HANDLER_PRESSURE_H_ -#include "config_data.h" +#include int32_t wx_get_pressure_measurement(const config_data_wx_sources_t * const config_sources, const config_data_mode_t * const config_mode, const config_data_umb_t * const config_umb, const config_data_rtu_t * const config_rtu); int32_t wx_get_pressure_ms5611(float * const pressure); diff --git a/include/wx_handler_temperature.h b/include/wx_handler_temperature.h index 7bfd0f0..390d974 100644 --- a/include/wx_handler_temperature.h +++ b/include/wx_handler_temperature.h @@ -8,7 +8,7 @@ #ifndef WX_HANDLER_TEMPERATURE_H_ #define WX_HANDLER_TEMPERATURE_H_ -#include "config_data.h" +#include int32_t wx_get_temperature_measurement(const config_data_wx_sources_t * const config_sources, const config_data_mode_t * const config_mode, const config_data_umb_t * const config_umb, const config_data_rtu_t * const config_rtu, float * output); int32_t wx_get_temperature_dallas(void); diff --git a/src/it_handlers.c b/src/it_handlers.c index 5065041..fbb24cd 100644 --- a/src/it_handlers.c +++ b/src/it_handlers.c @@ -40,7 +40,7 @@ #include "rte_main.h" -#include +#include #include "station_config.h" diff --git a/src/kiss_protocol/kiss_callback.c b/src/kiss_protocol/kiss_callback.c index 874c15d..7fa66d5 100644 --- a/src/kiss_protocol/kiss_callback.c +++ b/src/kiss_protocol/kiss_callback.c @@ -1,17 +1,21 @@ /* * kiss_callback.c * + * This file contains callback to all async sudo-UDS services requests. Each + * callback takes pointer for buffer and response. It returns a size of a + * response. + * * Created on: Aug 17, 2022 * Author: mateusz */ -#include #include #include #include "main.h" #include #include +#include #define KISS_MAX_CONFIG_PAYLOAD_SIZE 0x80 #define KISS_LAST_ASYNC_MSG 0xFF @@ -139,14 +143,14 @@ int32_t kiss_callback_erase_startup(uint8_t* input_frame_from_host, uint16_t inp #define ERASE_STARTUP_LN 6 - configuration_erase_startup_t result = configuration_handler_erase_startup(); + kiss_communication_nrc_t result = configuration_handler_erase_startup(); // construct a response response_buffer[0] = FEND; response_buffer[1] = NONSTANDARD; response_buffer[2] = ERASE_STARTUP_LN; // message lenght response_buffer[3] = KISS_ERASE_STARTUP_CFG_RESP; - response_buffer[4] = result; + response_buffer[4] = (uint8_t)result; response_buffer[5] = FEND; return ERASE_STARTUP_LN; @@ -154,15 +158,15 @@ int32_t kiss_callback_erase_startup(uint8_t* input_frame_from_host, uint16_t inp /** * Callback which program configuration data block received from the Host PC. Please bear in mind that the TNC doesn't really take care - * what it receices and program. It is up to host PC to provide senseful configuration with properly calculated checksum as this isn't - * recalculated ruing programming. + * what it receives and program. It is up to host PC to provide senseful configuration with properly calculated checksum as this isn't + * recalculated during programming. */ int32_t kiss_callback_program_startup(uint8_t* input_frame_from_host, uint16_t input_len, uint8_t* response_buffer, uint16_t buffer_size) { #define PROGRAM_STARTUP_LN 6 /** - * The structure of input frame goes like that: + * The structure of an input frame goes like that: * FEND, KISS_PROGRAM_STARTUP_CFG, data_PAYLOAD_LN, OFFSET_LSB, OFFSET_MSB, data, data, (...), FEND * * KISS_PROGRAM_STARTUP_CFG is a frame type, in this case 0x34, but might be also 0x00 for regular @@ -172,7 +176,7 @@ int32_t kiss_callback_program_startup(uint8_t* input_frame_from_host, uint16_t i */ // result to be returned to the host PC - configuration_erase_startup_t result; + kiss_communication_nrc_t result; // offset within input frame where config start begining uint8_t * data_ptr = input_frame_from_host + 5; @@ -189,7 +193,7 @@ int32_t kiss_callback_program_startup(uint8_t* input_frame_from_host, uint16_t i response_buffer[1] = NONSTANDARD; response_buffer[2] = PROGRAM_STARTUP_LN; // message lenght response_buffer[3] = KISS_PROGRAM_STARTUP_CFG_RESP; - response_buffer[4] = result; + response_buffer[4] = (uint8_t)result; response_buffer[5] = FEND; return PROGRAM_STARTUP_LN; diff --git a/src/kiss_protocol/kiss_communication.c b/src/kiss_protocol/kiss_communication.c index 578320c..b22d6e5 100644 --- a/src/kiss_protocol/kiss_communication.c +++ b/src/kiss_protocol/kiss_communication.c @@ -5,8 +5,6 @@ * Author: mateusz */ -#include -#include #include "main.h" #include "station_config.h" @@ -17,6 +15,8 @@ #include #include #include +#include +#include extern unsigned short tx10m; @@ -26,6 +26,17 @@ extern unsigned short tx10m; */ uint8_t kiss_current_async_message = 0xFF; +#define KISS_NRC_RESPONSE_UNKNOWN_SERVICE_LN 6 + +//!< Neagitve response to a request with unknown service id +uint8_t kiss_nrc_response_unknown_service[KISS_NRC_RESPONSE_UNKNOWN_SERVICE_LN] = { + FEND, + NONSTANDARD, + KISS_NRC_RESPONSE_UNKNOWN_SERVICE_LN, + KISS_COMMUNICATION_NRC_SERVICE, + NRC_SERVICE_NOT_SUPPORTED, + FEND}; + uint8_t kiss_async_pooler(uint8_t* output, uint16_t output_len ) { @@ -183,6 +194,7 @@ int32_t kiss_parse_received(uint8_t* input_frame_from_host, uint16_t input_len, default: { + // unknown service output = -3; } } diff --git a/src/kiss_protocol/kiss_did.c b/src/kiss_protocol/kiss_did.c index 0e25b30..5e57ee8 100644 --- a/src/kiss_protocol/kiss_did.c +++ b/src/kiss_protocol/kiss_did.c @@ -26,7 +26,7 @@ typedef struct kiss_did_numeric_definition_t { }kiss_did_numeric_definition_t; //!< Definition of all DIDs with numeric data -const kiss_did_numeric_definition_t kiss_did_def[] = { +const static kiss_did_numeric_definition_t kiss_did_def[] = { DIDS_NUMERIC(DID_NUMERIC_DEFINITION_EXPANDER) }; @@ -42,5 +42,23 @@ const kiss_did_numeric_definition_t kiss_did_def[] = { */ void kiss_did_response(uint16_t identifier, uint8_t * output_buffer, uint16_t buffer_ln) { + // iterator to go through DID definition + int i = 0; + + // data of a did found in configuration + kiss_did_numeric_definition_t found = {.identifier = 0xFFFFu}; + // iterate through DID definition and check if this id exist there + do { + // check if current position is the DID we're looking for + if (kiss_did_def[i].identifier == identifier) { + // if yes copy this data and exit the loop + found = kiss_did_def[i]; + } + else { + // if no, go to the next DID definition + i++; + } + } while (kiss_did_def[i].identifier != 0xFFFFU); + } diff --git a/src/main.c b/src/main.c index af32ed5..409bf6e 100644 --- a/src/main.c +++ b/src/main.c @@ -39,8 +39,8 @@ #include "packet_tx_handler.h" #include "station_config.h" -#include -#include +#include +#include #include "diag/Trace.h" #include "antilib_adc.h" diff --git a/src/configuration_nvm/config_data_default.c b/src/stored_configuration_nvm/config_data_default.c similarity index 99% rename from src/configuration_nvm/config_data_default.c rename to src/stored_configuration_nvm/config_data_default.c index f096842..036e924 100644 --- a/src/configuration_nvm/config_data_default.c +++ b/src/stored_configuration_nvm/config_data_default.c @@ -9,7 +9,7 @@ // configuration data (CRC32 calculated from both sections is wrong). In such case the software erases both sections and // reprogram it from the default set stored somewhere within .code section -#include +#include #include "io_default_vbat_scaling.h" #include "station_config.h" diff --git a/src/configuration_nvm/config_data_first.c b/src/stored_configuration_nvm/config_data_first.c similarity index 99% rename from src/configuration_nvm/config_data_first.c rename to src/stored_configuration_nvm/config_data_first.c index 19a7666..90dd4fb 100644 --- a/src/configuration_nvm/config_data_first.c +++ b/src/stored_configuration_nvm/config_data_first.c @@ -10,7 +10,7 @@ * Please look at 'station_config.h' instead to set all parameters. */ -#include +#include #include "io_default_vbat_scaling.h" #include "station_config.h" diff --git a/src/configuration_nvm/config_data_second.c b/src/stored_configuration_nvm/config_data_second.c similarity index 99% rename from src/configuration_nvm/config_data_second.c rename to src/stored_configuration_nvm/config_data_second.c index f9bfbd0..060ed9e 100644 --- a/src/configuration_nvm/config_data_second.c +++ b/src/stored_configuration_nvm/config_data_second.c @@ -5,7 +5,7 @@ * Author: mateusz */ -#include +#include #include "io_default_vbat_scaling.h" #include "station_config.h" diff --git a/src/configuration_nvm/configuration_handler.c b/src/stored_configuration_nvm/configuration_handler.c similarity index 97% rename from src/configuration_nvm/configuration_handler.c rename to src/stored_configuration_nvm/configuration_handler.c index 1312bd6..0d87d27 100644 --- a/src/configuration_nvm/configuration_handler.c +++ b/src/stored_configuration_nvm/configuration_handler.c @@ -5,10 +5,9 @@ * Author: mateusz */ -#include -#include -#include -#include "station_config_target_hw.h" +#include +#include +#include #include "io_default_vbat_scaling.h" @@ -642,7 +641,7 @@ void configuration_handler_load_configuration(configuration_handler_region_t reg } -configuration_erase_startup_t configuration_handler_erase_startup(void) { +kiss_communication_nrc_t configuration_handler_erase_startup(void) { // flash operation result FLASH_Status flash_status = 0; @@ -655,7 +654,7 @@ configuration_erase_startup_t configuration_handler_erase_startup(void) { page_address = (uint32_t)config_section_first_start; } else { - return ERASE_STARTUP_IDLE; + return NRC_UPLOAD_DOWNLOAD_NOT_ACCEPTED; } @@ -671,14 +670,14 @@ configuration_erase_startup_t configuration_handler_erase_startup(void) { FLASH_Lock(); if (flash_status == FLASH_COMPLETE) { - return ERASE_STARTUP_DONE; + return NRC_POSITIVE; } else { - return ERASE_STARTUP_ERROR; + return NRC_GENERAL_PROGRAMMING_FAIL; } } -configuration_erase_startup_t configuration_handler_program_startup(uint8_t * data, uint8_t dataln, uint16_t offset) { +kiss_communication_nrc_t configuration_handler_program_startup(uint8_t * data, uint8_t dataln, uint16_t offset) { int comparision_result; @@ -698,11 +697,11 @@ configuration_erase_startup_t configuration_handler_program_startup(uint8_t * da target = (void *)config_section_first_start + offset; } else { - return ERASE_STARTUP_IDLE; + return NRC_UPLOAD_DOWNLOAD_NOT_ACCEPTED; } if ((dataln % 8) != 0) { - return ERASE_STARTUP_IDLE; + return NRC_UPLOAD_DOWNLOAD_NOT_ACCEPTED; } @@ -715,16 +714,16 @@ configuration_erase_startup_t configuration_handler_program_startup(uint8_t * da comparision_result = memcmp((const void * )target, (const void * )source, dataln); if (comparision_result == 0) { - return ERASE_STARTUP_DONE; + return NRC_POSITIVE; } else { - return ERASE_STARTUP_ERROR; + return NRC_GENERAL_PROGRAMMING_FAIL; } - return ERASE_STARTUP_DONE; + return NRC_POSITIVE; } else { - return ERASE_STARTUP_ERROR; + return NRC_GENERAL_PROGRAMMING_FAIL; } } diff --git a/system/include/aprs/digi.h b/system/include/aprs/digi.h index 4f23600..0c6249a 100644 --- a/system/include/aprs/digi.h +++ b/system/include/aprs/digi.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_APRS_DIGI_H_ #define INCLUDE_APRS_DIGI_H_ -#include +#include #include "aprs/ax25.h" #define DIGI_PACKET_DIGIPEATED 1 diff --git a/system/include/aprs/telemetry.h b/system/include/aprs/telemetry.h index 4170446..b54cc27 100644 --- a/system/include/aprs/telemetry.h +++ b/system/include/aprs/telemetry.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_APRS_TELEMETRY_H_ #define INCLUDE_APRS_TELEMETRY_H_ -#include +#include #include "./drivers/dallas.h" #include "./drivers/ms5611.h" #include "./umb_master/umb_qf_t.h" diff --git a/system/include/drivers/max31865.h b/system/include/drivers/max31865.h index 10bf394..23fad9e 100644 --- a/system/include/drivers/max31865.h +++ b/system/include/drivers/max31865.h @@ -8,10 +8,10 @@ #ifndef INCLUDE_DRIVERS_MAX31865_H_ #define INCLUDE_DRIVERS_MAX31865_H_ -#include #include "drivers/spi.h" #include +#include #define MAX_3WIRE 3 #define MAX_4WIRE 1 diff --git a/system/include/gsm/sim800c_gprs.h b/system/include/gsm/sim800c_gprs.h index 94528ee..ed45426 100644 --- a/system/include/gsm/sim800c_gprs.h +++ b/system/include/gsm/sim800c_gprs.h @@ -9,7 +9,7 @@ #define INCLUDE_GSM_SIM800C_GPRS_H_ -#include +#include #include "drivers/serial.h" #include "gsm/sim800_state_t.h" diff --git a/system/include/gsm/sim800c_poolers.h b/system/include/gsm/sim800c_poolers.h index 1b77aea..e82ce1d 100644 --- a/system/include/gsm/sim800c_poolers.h +++ b/system/include/gsm/sim800c_poolers.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_GSM_SIM800C_POOLERS_H_ #define INCLUDE_GSM_SIM800C_POOLERS_H_ -#include +#include #include "drivers/serial.h" #include "gsm/sim800_state_t.h" diff --git a/system/include/modbus_rtu/rtu_getters.h b/system/include/modbus_rtu/rtu_getters.h index a25261b..30d50d0 100644 --- a/system/include/modbus_rtu/rtu_getters.h +++ b/system/include/modbus_rtu/rtu_getters.h @@ -8,8 +8,8 @@ #ifndef INCLUDE_MODBUS_RTU_RTU_GETTERS_H_ #define INCLUDE_MODBUS_RTU_RTU_GETTERS_H_ -#include #include +#include int32_t rtu_get_temperature(int16_t* out, const config_data_rtu_t * const config); int32_t rtu_get_pressure(float* out, const config_data_rtu_t * const config); diff --git a/system/include/modbus_rtu/rtu_serial_io.h b/system/include/modbus_rtu/rtu_serial_io.h index f60e238..981107d 100644 --- a/system/include/modbus_rtu/rtu_serial_io.h +++ b/system/include/modbus_rtu/rtu_serial_io.h @@ -8,8 +8,8 @@ #ifndef INCLUDE_MODBUS_RTU_RTU_SERIAL_IO_H_ #define INCLUDE_MODBUS_RTU_RTU_SERIAL_IO_H_ -#include #include +#include #include "./drivers/serial.h" diff --git a/system/include/umb_master/umb_0x23_offline_data.h b/system/include/umb_master/umb_0x23_offline_data.h index fb2c5f3..833b262 100644 --- a/system/include/umb_master/umb_0x23_offline_data.h +++ b/system/include/umb_master/umb_0x23_offline_data.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_UMB_MASTER_UMB_0X23_OFFLINE_DATA_H_ #define INCLUDE_UMB_MASTER_UMB_0X23_OFFLINE_DATA_H_ -#include +#include #include "./umb_master/umb_retval_t.h" #include "./umb_master/umb_frame_t.h" #include "./umb_master/umb_context_t.h" diff --git a/system/include/umb_master/umb_0x26_status.h b/system/include/umb_master/umb_0x26_status.h index 9ca5927..2a63233 100644 --- a/system/include/umb_master/umb_0x26_status.h +++ b/system/include/umb_master/umb_0x26_status.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_UMB_MASTER_UMB_0X26_STATUS_H_ #define INCLUDE_UMB_MASTER_UMB_0X26_STATUS_H_ -#include +#include #include "../umb_master/umb_retval_t.h" #include "../umb_master/umb_context_t.h" #include "../umb_master/umb_frame_t.h" diff --git a/system/include/umb_master/umb_channel_pool.h b/system/include/umb_master/umb_channel_pool.h index 251ad58..d889ff9 100644 --- a/system/include/umb_master/umb_channel_pool.h +++ b/system/include/umb_master/umb_channel_pool.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_UMB_MASTER_UMB_CHANNEL_POOL_H_ #define INCLUDE_UMB_MASTER_UMB_CHANNEL_POOL_H_ -#include +#include #include "umb_context_t.h" #include "umb_frame_t.h" diff --git a/system/include/umb_master/umb_master.h b/system/include/umb_master/umb_master.h index 5935423..4410782 100644 --- a/system/include/umb_master/umb_master.h +++ b/system/include/umb_master/umb_master.h @@ -8,7 +8,7 @@ #ifndef INCLUDE_UMB_MASTER_UMB_MASTER_H_ #define INCLUDE_UMB_MASTER_UMB_MASTER_H_ -#include +#include #include #include #include diff --git a/system/src/umb_master/umb_0x26_status.c b/system/src/umb_master/umb_0x26_status.c index d831a45..610d8a1 100644 --- a/system/src/umb_master/umb_0x26_status.c +++ b/system/src/umb_master/umb_0x26_status.c @@ -5,7 +5,7 @@ * Author: mateusz */ -#include +#include #include "../umb_master/umb_master.h" #include "../umb_master/umb_0x26_status.h" #include "main.h"