gitea/g0b1vetx-board
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引入mqtt 引入cjson

Browse Source
This commit is contained in:
2584532475@qq.com committed 2023-11-30 08:10:01 +08:00
1 parent a69c1a58d6
commit f8591b8b99
86 files changed
+12141 -2157
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

middleware/Util/util.c
+81 -2
View File
@@ -1,7 +1,7 @@
#include "util.h"
#include <ctype.h>
float Bytes2Float(char * data)
float Bytes2Float (char * data)
{
Float ff ;
ff.byte[0] = data[1];
@@ -11,6 +11,85 @@ float Bytes2Float(char * data)
return ff.data;
}
uint32_t Bytes2Int (char * data)
{
Int I;
I.byte[0] = data[1];
I.byte[1] = data[0];
I.byte[2] = data[3];
I.byte[3] = data[2];
return I.data;
}
// -----------------------------------------------------------------
// 函数功能: hex字符串转byte数组
// 函数名称: hexbyte_to_hex_str
// 参数1 : src 源字符串
// 参数2 : obj 目标字节数组
// 说明 : "01020304" --> {0x01,0x03,0x03,x04} 或 "01 02 03 04"->{0x01,0x03,0x03,x04}
// 返回值 : 1 成功
// -----------------------------------------------------------------
int hexstr_to_hexbyte (char *src, char *obj, uint16_t length)
{
char h1, h2;
uint8_t s1, s2;
int i;
length = length / 2;
for (i = 0; i < length; i++)
{
h1 = src[2 * i];
h2 = src[2 * i + 1];
s1 = toupper (h1) - 0x30;
if (s1 > 9)
s1 -= 7;
s2 = toupper (h2) - 0x30;
if (s2 > 9)
s2 -= 7;
obj[i] = s1 * 16 + s2;
}
return length;
}
// 754 转float
float float_to_iee754 (float ff1,char * data)
{
Float ff;
ff.data = ff1;
data[0] = ff.byte[3];
data[1] = ff.byte[2];
data[2] = ff.byte[1];
data[3] = ff.byte[0];
return ff.data;
}
// 754 转float
float iee754_to_float (char * data)
{
Float ff;
ff.byte[3] = data[0];
ff.byte[2] = data[1];
ff.byte[1] = data[2];
ff.byte[0] = data[3];
return ff.data;
}
uint32_t byte_to_Inverse(char * data)
{
Int I;
I.byte[0] = data[3];
I.byte[1] = data[2];
I.byte[2] = data[1];
I.byte[3] = data[0];
return I.data;
}
middleware/Util/util.h
+12 -4
View File
@@ -3,18 +3,26 @@
#include <stdint.h>
typedef union {
typedef union
{
uint32_t data;
char byte[4];
} Int;
typedef union {
typedef union
{
float data;
char byte[4];
} Float;
float Bytes2Float(char * data);
float Bytes2Float (char * data);
uint32_t Bytes2Int (char * data);
int hexstr_to_hexbyte (char *src, char *obj, uint16_t length);
float iee754_to_float (char * data);
uint32_t byte_to_Inverse(char * data);
// 754 תfloat
float float_to_iee754 (float ff1,char * data);
#endif
#endif
middleware/cjson/cjson-master/cjson-master/cJSON.c
+3116
View File
File diff suppressed because it is too large. Load diff
middleware/cjson/cjson-master/cjson-master/cJSON.h
+294
View File
@@ -0,0 +1,294 @@
/*
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef cJSON__h
#define cJSON__h
#ifdef __cplusplus
extern "C"
{
#endif
#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
#define __WINDOWS__
#endif
#ifdef __WINDOWS__
/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options:
CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
For *nix builds that support visibility attribute, you can define similar behavior by
setting default visibility to hidden by adding
-fvisibility=hidden (for gcc)
or
-xldscope=hidden (for sun cc)
to CFLAGS
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
*/
#define CJSON_CDECL __cdecl
#define CJSON_STDCALL __stdcall
/* export symbols by default, this is necessary for copy pasting the C and header file */
#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
#define CJSON_EXPORT_SYMBOLS
#endif
#if defined(CJSON_HIDE_SYMBOLS)
#define CJSON_PUBLIC(type) type CJSON_STDCALL
#elif defined(CJSON_EXPORT_SYMBOLS)
#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL
#elif defined(CJSON_IMPORT_SYMBOLS)
#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL
#endif
#else /* !__WINDOWS__ */
#define CJSON_CDECL
#define CJSON_STDCALL
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
#else
#define CJSON_PUBLIC(type) type
#endif
#endif
/* project version */
#define CJSON_VERSION_MAJOR 1
#define CJSON_VERSION_MINOR 7
#define CJSON_VERSION_PATCH 15
#include <stddef.h>
/* cJSON Types: */
#define cJSON_Invalid (0)
#define cJSON_False (1 << 0)
#define cJSON_True (1 << 1)
#define cJSON_NULL (1 << 2)
#define cJSON_Number (1 << 3)
#define cJSON_String (1 << 4)
#define cJSON_Array (1 << 5)
#define cJSON_Object (1 << 6)
#define cJSON_Raw (1 << 7) /* raw json */
#define cJSON_IsReference 256
#define cJSON_StringIsConst 512
/* The cJSON structure: */
typedef struct cJSON
{
/* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
struct cJSON *next;
struct cJSON *prev;
/* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
struct cJSON *child;
/* The type of the item, as above. */
int type;
/* The item's string, if type==cJSON_String and type == cJSON_Raw */
char *valuestring;
/* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
int valueint;
/* The item's number, if type==cJSON_Number */
double valuedouble;
/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
char *string;
} cJSON;
typedef struct cJSON_Hooks
{
/* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
void *(CJSON_CDECL *malloc_fn)(size_t sz);
void (CJSON_CDECL *free_fn)(void *ptr);
} cJSON_Hooks;
typedef int cJSON_bool;
/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
* This is to prevent stack overflows. */
#ifndef CJSON_NESTING_LIMIT
#define CJSON_NESTING_LIMIT 1000
#endif
/* returns the version of cJSON as a string */
char* cJSON_Version(void);
/* Supply malloc, realloc and free functions to cJSON */
//CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
CJSON_PUBLIC(void) cJSON_InitHooks(void);
/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
/* Render a cJSON entity to text for transfer/storage. */
CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
/* Render a cJSON entity to text for transfer/storage without any formatting. */
CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
/* Delete a cJSON entity and all subentities. */
CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
/* Returns the number of items in an array (or object). */
CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
/* Get item "string" from object. Case insensitive. */
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
/* Check item type and return its value */
CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
/* These functions check the type of an item */
CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
/* These calls create a cJSON item of the appropriate type. */
CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
/* raw json */
CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
/* Create a string where valuestring references a string so
* it will not be freed by cJSON_Delete */
CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
/* Create an object/array that only references it's elements so
* they will not be freed by cJSON_Delete */
CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
/* These utilities create an Array of count items.
* The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
/* Append item to the specified array/object. */
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
* WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
* writing to `item->string` */
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
/* Remove/Detach items from Arrays/Objects. */
CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
/* Update array items. */
CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
/* Duplicate a cJSON item */
CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
* need to be released. With recurse!=0, it will duplicate any children connected to the item.
* The item->next and ->prev pointers are always zero on return from Duplicate. */
/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
* case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
* The input pointer json cannot point to a read-only address area, such as a string constant,
* but should point to a readable and writable address area. */
CJSON_PUBLIC(void) cJSON_Minify(char *json);
/* Helper functions for creating and adding items to an object at the same time.
* They return the added item or NULL on failure. */
CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
/* When assigning an integer value, it needs to be propagated to valuedouble too. */
#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
/* helper for the cJSON_SetNumberValue macro */
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
/* Macro for iterating over an array or object */
#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
CJSON_PUBLIC(void) cJSON_free(void *object);
#ifdef __cplusplus
}
#endif
#endif
middleware/easyflash/inc/ef_api.h
+24
View File
@@ -0,0 +1,24 @@
#include "stm32g0xx_hal.h"
#include <easyflash.h>
#include <stdlib.h>
#include <string.h>
// 获取uint32_t 的数值
uint32_t ef_get_integer(const char * key);
// 获取double 的数值
double ef_get_double(const char* key);
// 获取字符串的数值
char* ef_get_string(const char* key);
// 存储无符号整
void ef_save_uint(const char* key, unsigned int value);
// 存储string类型
void ef_save_string(const char* key, char* value, int size);
middleware/easyflash/port/ef_api.c
+25 -4
View File
@@ -2,19 +2,19 @@
#include <easyflash.h>
#include <stdlib.h>
#include <string.h>
#include "rtthread.h"
// 获取uint32_t 的数值
uint32_t ef_get_integer(const char * key)
{
uint32_t integer = NULL;
char * value_ptr;
char * value_ptr;
/* get the boot count number from Env */
value_ptr = ef_get_env (key);
integer = atol (value_ptr);
integer = atoi (value_ptr);
return integer;
}
@@ -42,3 +42,24 @@ char * ef_get_string(const char * key)
}
// 存储无符号整
void ef_save_uint(const char* key, unsigned int value)
{
char valuebuff[128];
rt_sprintf(valuebuff, "%u", value);
ef_set_env(key, valuebuff);
ef_save_env();
}
// 存储string类型
void ef_save_string(const char* key, char* value, int size)
{
char valuebuff[128];
rt_sprintf(valuebuff, "%*.s", size, value);
//rt_kprintf("%s\r\n",valuebuff);
ef_set_env(key, valuebuff);
ef_save_env();
}
middleware/easyflash/port/ef_port.c
+33 -22
View File
@@ -40,15 +40,21 @@ static const ef_env default_env_set[] = {
{"iap_need_uart_update", "0"}, // 需要通过串口升级
{"iap_app_filename", "App.bin"},
{"stop_in_bootloader", "0"},
{"device_id", "0000000001"},
{"boot_times", "0"},
{"jump_boot_time", "10"}, // BOOT 等待时间 10s
// 基础参数设置
{"device_id", "0000000003"},
{"app_id", "220000"}, // 业务ID
{"user_pass", "123456"},
{"sys_pass", "898909"},
{"mqtt_user", "admin"},
{"mqtt_pass", "admin"},
{"mqtt_addr", "mqtt.zyjzjs.cn"},
{"mqtt_port", "1883"},
{"boot_times", "0"},
{"jump_boot_time", "10"}, // BOOT 等待时间 10s
{"net_drv", "dtu"}, // mqtt dtu ec200
{"eth2_chann", "1"}, //以太网通道2
{"mqtt_topic", "sluice"}, //订阅topic
{"net_drv", "dtu"}, // mqtt dtu ec200 eth
{"eth2_chann", "0"}, //以太网通道2 支持modbus
// 传感器基础参数配置
{"di1", "0"},// 0 表示未定义 1 表示 上限位，2：下限位 3： 开关4：关 5：停止
@@ -58,14 +64,10 @@ static const ef_env default_env_set[] = {
{"di5", "0"},// 0 表示未定义 1 表示 上限位，2：下限位 3： 开关4：关 5：停止
{"di6", "0"},// 0 表示未定义 1 表示 上限位，2：下限位 3： 开关4：关 5：停止
// 485 配置参数
{"s4851num", "1"}, // 4851 接入传感器的个数
{"s4852num", "0"}, // 4852 接入传感器的个数
{"s4851func", "0100000000000000"}, // 4851 接入传感器的类型
{"s4852func", "0000000000000000"}, // 4852 接入传感器的类型
{"s4851bute", "9600"}, // 4851 波特率
{"s4852bute", "19200"}, // 4852 波特率
{"s4851para", "0"}, // 4851 接入传感器的个数
{"s4852para", "0"}, // 4851 接入传感器的个数
{"u485func", "mg1000"}, // 用于一个柜子控制多台闸门
{"s4851func", "rds600"}, // 4851 接入传感器的类型 rds600 tds300
{"s4852func", "modbus"}, // 4852 接入传感器的类型
// 模拟量配置
{"ai1", "0"}, // AI1接入设备
{"ai2", "0"}, // AI2接入设备
@@ -80,18 +82,27 @@ static const ef_env default_env_set[] = {
{"pwm4", "0"}, // PWM4功能
// 闸门参数设置
{"maxopen", "140"}, // PWM4功能
{"maxecode", "0"}, // PWM4功能
{"minecode", "0"}, // PWM4功能
{"codepre", "0"}, // 编码器和闸门开度的比
{"max_open", "1400"}, // 最大开度
{"max_ecode", "31241"}, // 编码器最大编码
{"min_ecode", "32828"}, // 编码器最小编码
{"exec_time", "50"}, // 异常检测时间 单位100ms 50 就是 5s
// 闸门参数设置
{"motortype", "140"}, // PWM4功能
{"codertype", "0"}, // PWM4功能
{"loadrtype", "0"}, // PWM4功能
{"flowrtype", "0"}, // 编码器和闸门开度的比
{"ctrl_mode", "0"}, // 控制模式 // 1 直接开度控制，0 反馈开度控制
{"motor_type", "mg1000"}, // 电机类型 // mg a3 b5
{"simu_flow", "0"}, // 0 未启动 1 水位流量关系表 2巴歇尔槽启动流量关系表
{"parshall", "7"}, // 巴歇尔槽规格
// 流量数据存储
{"ttflow", "0"}, // 累计流量
{"chancnt", "1"}, // 流量计通道数
{"site_type", "sluice"}, // 0,闸门站，1，流量站，2，渗流渗压站，3，自动化采集站，4，串口服务器
{"level","[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"},
{"flow", "[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"},
{"wsid","[128,2,3,4,5,6]"},
// 水位流量关系表 配置10 个点
{"speed", "0"}, // 编码器和闸门开度的比
};
middleware/easylogger/inc/elog.h
+1 -1
View File
@@ -124,7 +124,7 @@ extern "C" {
#endif /* ELOG_OUTPUT_ENABLE */
/* all formats index */
typedef enum {
typedef enum { //
ELOG_FMT_LVL = 1 << 0, /**< level */
ELOG_FMT_TAG = 1 << 1, /**< tag */
ELOG_FMT_TIME = 1 << 2, /**< current time */
middleware/easylogger/port/elog_port.c
+2 -1
View File
@@ -28,6 +28,7 @@
#include <elog.h>
#include <stdio.h>
#include <rtthread.h>
/**
* EasyLogger port initialize
@@ -61,7 +62,7 @@ void elog_port_deinit(void) {
void elog_port_output(const char *log, size_t size) {
/* add your code here */
printf("%.*s", size, log);
rt_kprintf("%.*s", size, log);
}
/**
middleware/modbus/modbus-m.c
+90
View File
@@ -2,6 +2,8 @@
#include<stdint.h>
#include "crc.h"
#include "modbus-m.h"
#include "rtthread.h"
// 读取保持寄存器的值
// addr 寄存器地址
@@ -22,6 +24,25 @@ int modbus_m_read_regist(uint8_t id,uint16_t addr,uint16_t length,uint8_t * data
return index;
}
// 读取输入的值
// addr 寄存器地址
// id 丛机地址
// length 读取丛机数据长度
int modbus_m_read_input(uint8_t id,uint16_t addr,uint16_t length,uint8_t * data)
{
uint16_t index = 0,crc;
data[index++] = id;
data[index++] = 0x04;
data[index++] = (addr >> 8) & 0x00FF;
data[index++] = addr & 0x00FF;
data[index++] = (length >> 8) & 0x00FF;
data[index++] = length & 0x00FF;
crc = MX_CRC_CALC(data,index);
data[index++] = crc & 0x00FF;
data[index++] = (crc >> 8) & 0x00FF;
return index;
}
// 写入寄存器
// addr 寄存器地址
@@ -43,3 +64,72 @@ int modbus_m_write_regist(uint8_t id,uint16_t addr,uint16_t key,uint8_t * data)
}
//03 10 00 02 00 02 04 41 00 00 00
// 写入寄存器
// addr 寄存器地址
// id 丛机地址
// length 读取丛机数据长度
int modbus_m_write_mregist(uint8_t id,uint16_t addr,uint8_t *key,uint16_t size ,uint8_t * data)
{
uint16_t index = 0,crc;
data[index++] = id;
data[index++] = 0x10;
data[index++] = (addr >> 8) & 0x00FF;
data[index++] = addr & 0x00FF;
data[index++] = (size >> 8) & 0x00FF;
data[index++] = size & 0x00FF;
data[index++] = size * 2;
for (int i =0;i < size * 2;i++)
{
data[index++] = key[i];
}
crc = MX_CRC_CALC(data,index);
data[index++] = crc & 0x00FF;
data[index++] = (crc >> 8) & 0x00FF;
return index;
}
// 写入寄存器
// addr 寄存器地址
// id 丛机地址
// length 读取丛机数据长度
int modbus_m_write_coil(uint8_t id,uint16_t addr,uint16_t key,uint8_t * data)
{
uint16_t index = 0,crc;
data[index++] = id;
data[index++] = 0x05;
data[index++] = (addr >> 8) & 0x00FF;
data[index++] = addr & 0x00FF;
if (key == 1)
{
data[index++] = (addr >> 8) & 0x00FF;
data[index++] = addr & 0x00FF;
}
else
{
data[index++] = 0x00;
data[index++] = 0x00;
}
crc = MX_CRC_CALC(data,index);
data[index++] = crc & 0x00FF;
data[index++] = (crc >> 8) & 0x00FF;
return index;
}
MOD_T modbus_m_crc_check(uint8_t * data,int size )
{
uint16_t rcrc = 0,ccrc;
if (size < 4)
{
return MOD_ERR;
}
ccrc = MX_CRC_CALC(data,size-2);
rcrc = ((uint16_t)data[size-1] << 8 )+ (uint16_t)data[size-2];
if (ccrc == rcrc )
return MOD_OK;
return MOD_ERR;
}
middleware/modbus/modbus-m.h
+9
View File
@@ -2,9 +2,18 @@
#define MODBUS_M_H
#include <stdint.h>
typedef enum {
MOD_OK = 0,
MOD_ERR = 1
}MOD_T;
int modbus_m_read_regist(uint8_t id,uint16_t addr,uint16_t length,uint8_t * data);
int modbus_m_write_regist(uint8_t id,uint16_t addr,uint16_t key,uint8_t * data);
int modbus_m_read_input(uint8_t id,uint16_t addr,uint16_t length,uint8_t * data) ;
int modbus_m_write_coil(uint8_t id,uint16_t addr,uint16_t key,uint8_t * data);
MOD_T modbus_m_crc_check(uint8_t * data,int size );
int modbus_m_write_mregist(uint8_t id,uint16_t addr,uint8_t *key,uint16_t size ,uint8_t * data);
#endif
middleware/modbus/modbus-s.c
+4 -6
View File
@@ -3,9 +3,10 @@
#include<stdint.h>
#include "crc.h"
#include "modbus-s.h"
#include "modbus-m.h"
#if !defined(LOG_TAG)
#define LOG_TAG "main"
#define LOG_TAG "modbus-s"
#endif
#include <elog.h>
@@ -22,19 +23,16 @@ void ModbusSlaveInit(ModBusSlave_t * drv,uint8_t ID,uint8_t * data,uint16_t * r
//-1 地址错误
int ModbusSlaveHandle(ModBusSlave_t * drv,uint8_t * data,uint16_t length )
{
uint16_t rcrc = 0,ccrc = 0 ;
if( (data[0] != drv->ID) && (data[0] != 0x00))
{
// 地址错误
return -1;
}
rcrc = ((uint16_t)data[length- 1] << 8) + (uint16_t)data[length- 2] ;
ccrc = MX_CRC_CALC(data,length-2);
if (rcrc != ccrc )
if(modbus_m_crc_check(data,length) != MOD_OK)
{
log_e("rcrc:%04X,ccrc:%04X\r\n",rcrc,ccrc) ;
return -2;
}
drv->func = data[1] ;
switch (drv->func)
middleware/paho.mqtt.embedded-c
Submodule
+1
Submodule middleware/paho.mqtt.embedded-c added at 29ab2aa29c.
middleware/sfud/inc/sfud_cfg.h
+3
View File
@@ -29,6 +29,9 @@
#ifndef _SFUD_CFG_H_
#define _SFUD_CFG_H_
#ifndef BOOT
#define SFUD_DEBUG_MODE
#endif
#define SFUD_DEBUG_MODE
#define SFUD_USING_SFDP