Skip to content

Commit

Permalink
Merge pull request scikit-learn#24 from dataignitelab/feature/agent
Browse files Browse the repository at this point in the history 
Feature/agent
  • Loading branch information
@prismdata-dc
prismdata-dc committed Aug 25, 2020
2 parents 216119c + 53d5198 commit c0dfeb2
Show file tree
Hide file tree
Showing 18 changed files with 579 additions and 514 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
View file
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
pip install -r requirements.txt
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
Expand Down
3 changes: 1 addition & 2 deletions IoTGateWay/bsp/stm32/stm32f105RC/SA100/.cproject
View file
Expand Up @@ -37,15 +37,14 @@
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1558248730" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1605204898" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="STM32F105xC"/>
<listOptionValue builtIn="false" value="TS710S"/>
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="SA100"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.149448483" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/board}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/stm32_hal/STM32F1xx_HAL_Driver/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/components/finsh}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/stm32_hal/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/stm32_hal/CMSIS/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SA100/stm32_drive/config}&quot;"/>
Expand Down
88 changes: 0 additions & 88 deletions IoTGateWay/bsp/stm32/stm32f105RC/application/application.c
View file
Expand Up @@ -4,9 +4,6 @@

#include <board.h>
#include <drivers/rtc.h>
#ifdef RT_USING_FINSH
#include <finsh.h>
#endif

#include "application.h"
#include <config/appconfig.h>
Expand Down Expand Up @@ -92,88 +89,3 @@ rt_bool_t InitApplication(void)

return retVal;
}

#if defined (RT_USING_FINSH)
void bk_read(int argc, char **argv)
{
rt_device_t rtc_dev;
rt_err_t err;
rt_uint32_t idx;
rt_bk_data_t bk_read;

if (argc != 2) {
rt_kprintf("usage : bk_read 3\r\n");
rt_kprintf("read backup 3rd memory and return 4 bytes data\r\n");
rt_kprintf("index [1 .. 19]\r\n");
return;
}

rtc_dev = rt_device_find("rtc");
if (rtc_dev == RT_NULL)
{
rt_kprintf("rtc is not installed\r\n");
return;
}

idx = atoi(argv[1]);
bk_read.bk_id = idx;

err = rt_device_control(rtc_dev, RT_DEVICE_CTRL_RTC_GET_BKDATA, (void *)&bk_read);
if (err != RT_EOK)
{
rt_kprintf("read backup memory error : %d\r\n", err);
return;
}
rt_kprintf("backup memory %d => 0x%08x\r\n", idx, bk_read.bk_data);

return;
}
MSH_CMD_EXPORT(bk_read, read backup memory);

void bk_write(int argc, char **argv)
{
rt_device_t rtc_dev;
rt_err_t err;
rt_uint32_t idx, value;
rt_bk_data_t bk_read;

if (argc != 3) {
rt_kprintf("usage : bk_write 3 a5a57878\r\n");
rt_kprintf("write backup 3rd memory writing value is 0xA5A57878\r\n");
rt_kprintf("index [1 .. 19]\r\n");
return;
}

rtc_dev = rt_device_find("rtc");
if (rtc_dev == RT_NULL)
{
rt_kprintf("rtc is not installed\r\n");
return;
}

idx = atoi(argv[1]);
value = strtoul(argv[2], RT_NULL, 16);
bk_read.bk_id = idx;
bk_read.bk_data = value;

err = rt_device_control(rtc_dev, RT_DEVICE_CTRL_RTC_SET_BKDATA, (void *)&bk_read);
if (err != RT_EOK)
{
rt_kprintf("write backup memory error : %d\r\n", err);
return;
}
rt_kprintf("write backup memory %d => 0x%08x\r\n", idx, (rt_uint32_t)bk_read.bk_data);

bk_read.bk_data = 0;
err = rt_device_control(rtc_dev, RT_DEVICE_CTRL_RTC_GET_BKDATA, (void *)&bk_read);
if (err != RT_EOK)
{
rt_kprintf("read backup memory error : %d\r\n", err);
return;
}
rt_kprintf("read BK memory %d => 0x%08x\r\n", idx, (rt_uint32_t)bk_read.bk_data);

return;
}
MSH_CMD_EXPORT(bk_write, write backup memory);
#endif
2 changes: 1 addition & 1 deletion IoTGateWay/bsp/stm32/stm32f105RC/application/config/configuration.c
View file
Expand Up @@ -171,7 +171,7 @@ rt_uint8_t GetDhcpMode(void)
return configInfo.cfg.networkdCofig.dhcpMode;
}

void SetDhcpMode(rt_uint16_t data)
void SetDhcpMode(rt_uint8_t data)
{
Config *pCfg = &configInfo.cfg;

Expand Down
2 changes: 1 addition & 1 deletion IoTGateWay/bsp/stm32/stm32f105RC/application/config/configuration.h
View file
Expand Up @@ -53,7 +53,7 @@ void SetApPassword(rt_uint8_t *pData, rt_size_t dataSize);
rt_uint8_t *GetApSSID(void);
void SetApSSID(rt_uint8_t *pData, rt_size_t dataSize);
rt_uint8_t GetDhcpMode(void);
void SetDhcpMode(rt_uint16_t data);
void SetDhcpMode(rt_uint8_t data);
rt_uint8_t *GetMacAddress(void);
rt_bool_t SetMacAddress(rt_uint8_t *pData, rt_size_t dataSize);
rt_uint8_t GetManufactureMode(void);
Expand Down
75 changes: 45 additions & 30 deletions IoTGateWay/bsp/stm32/stm32f105RC/application/device/uart/plccomm.c
View file
Expand Up @@ -21,8 +21,9 @@
#define PV "PV" //PV
#define TS "TS"
#define TK "TK"
#define DEV_TYPE_TS 0 //TS
#define DEV_TYPE_TK 1 //TK
#define DEV_TYPE_TS 0
#define DEV_TYPE_TK 1
#define DEV_TYPE_INVALID 2
#define PV_LEN 2
#define TB_VALUE_LEN 2 //2 bytes value len
#define FB_VALUE_LEN 4 //4 bytes value len
Expand All @@ -45,9 +46,10 @@
#define SensorCode_15 0x000F
#define SensorCode_16 0x0010
#define SensorCode_17 0x0011
#define SensorCode_18 0x0012
#define SensorCode_19 0x0013

typedef struct dustCommInfo_tag {
rt_mq_t plcMq;
MqData_t mqData;

rt_device_t uport;
Expand Down Expand Up @@ -79,7 +81,7 @@ void SetTcpStatus(rt_uint8_t tcpOn)
}
}

static rt_err_t dustcomm_rx_ind(rt_device_t dev, rt_size_t size)
static rt_err_t plccomm_rx_ind(rt_device_t dev, rt_size_t size)
{
return rt_event_send(plcCommInfo.rx_event, SMSG_RX_DATA);
}
Expand Down Expand Up @@ -124,29 +126,23 @@ rt_size_t MakeSensorValue(rt_uint16_t sensorCode, rt_uint8_t *pData, rt_size_t p
rt_memcpy(pos, PV, PV_LEN);
pos += PV_LEN;

rt_uint32_t u32Val = 0;
length = sizeof(u32Val);

//Sensor Value
rt_memcpy(&u32Val,pData,length);
u32Val = HTONL(u32Val);
rt_memcpy(pos,&u32Val,length);
pos += length;

if((innerPress == sensorCode) || (outerPress == sensorCode))
{
rt_uint32_t u32Val = 0;
rt_uint8_t length = sizeof(u32Val);

rt_memcpy(&u32Val,pData,length);
u32Val = HTONL(u32Val);
rt_memcpy(pos,&u32Val,length);
pos += length;
flaotingPoint = 3;
*pos++ = flaotingPoint;

}
else
{
rt_uint16_t u16Val = 0;
rt_uint8_t length = sizeof(u16Val);

rt_memcpy(&u16Val,pData,length);
u16Val = HTONS(u16Val);
rt_memcpy(pos,&u16Val,length);
pos += length;
flaotingPoint = 1;
*pos++ = flaotingPoint;
}
Expand All @@ -165,42 +161,42 @@ static rt_size_t MakeSensorPayloadData(rt_uint8_t *pData, rt_uint16_t length)

begin++;//Skip STX of PLC Data
//sensor 1
if( SensorCode_1 == sensorCodeCount)
if( SensorCode_1 == sensorCodeCount) //Voltage1 RS
{
size += MakeSensorValue(SensorCode_1, begin, size);
}
begin += TB_VALUE_LEN;

//sensor 2
if( SensorCode_2 == sensorCodeCount)
if( SensorCode_2 == sensorCodeCount) //Voltage1 ST
{
size += MakeSensorValue(SensorCode_2, begin, size);
}
begin += TB_VALUE_LEN;

//sensor 3
if( SensorCode_3 == sensorCodeCount)
if( SensorCode_3 == sensorCodeCount) //Voltage1 RT
{
size += MakeSensorValue(SensorCode_3, begin, size);
}
begin += TB_VALUE_LEN;

//sensor 4
if( SensorCode_4 == sensorCodeCount)
if( SensorCode_4 == sensorCodeCount) //Current1 R
{
size += MakeSensorValue(SensorCode_4, begin, size);
}
begin += TB_VALUE_LEN;

//sensor 5
if( SensorCode_5 == sensorCodeCount)
if( SensorCode_5 == sensorCodeCount) //Current1 T
{
size += MakeSensorValue(SensorCode_5, begin, size);
}
begin += TB_VALUE_LEN;

//sensor 6
if( SensorCode_6 == sensorCodeCount)
if( SensorCode_6 == sensorCodeCount) //Current1 T
{
size += MakeSensorValue(SensorCode_6, begin, size);
}
Expand Down Expand Up @@ -231,18 +227,25 @@ static rt_size_t MakeSensorPayloadData(rt_uint8_t *pData, rt_uint16_t length)
begin += FB_VALUE_LEN;

//sensor 9
if( SensorCode_9 == sensorCodeCount)
if( SensorCode_9 == sensorCodeCount) //temperature PV
{
size += MakeSensorValue(SensorCode_9, begin, size);
}
begin += TB_VALUE_LEN;
begin += TB_VALUE_LEN;

//sensor 10
if( SensorCode_10 == sensorCodeCount)
if( SensorCode_10 == sensorCodeCount) //temperature SV
{
size += MakeSensorValue(SensorCode_10, begin, size);
}
begin += TB_VALUE_LEN;
begin += TB_VALUE_LEN;

//sensor 11
if( SensorCode_11 == sensorCodeCount) //over temp
{
size += MakeSensorValue(SensorCode_11, begin, size);
}
}
else// TK
{
Expand Down Expand Up @@ -288,6 +291,14 @@ static rt_size_t MakeSensorPayloadData(rt_uint8_t *pData, rt_uint16_t length)

//sensor 17
size += MakeSensorValue(SensorCode_17, begin, size);
begin += TB_VALUE_LEN;

//sensor 18
size += MakeSensorValue(SensorCode_18, begin, size);
begin += TB_VALUE_LEN;

//sensor 19
size += MakeSensorValue(SensorCode_19, begin, size);
}

pos = p_base+size;
Expand Down Expand Up @@ -359,7 +370,7 @@ static void plccomm_rx_thread(void *params)
err = rt_device_open(p_handle->uport, RT_DEVICE_OFLAG_RDONLY | RT_DEVICE_FLAG_INT_RX);
RT_ASSERT(err == RT_EOK);

rt_device_set_rx_indicate(p_handle->uport, dustcomm_rx_ind);
rt_device_set_rx_indicate(p_handle->uport, plccomm_rx_ind);
while(1)
{
if(RT_EOK == (err=rt_event_recv(p_handle->rx_event, SMSG_RX_DATA, (RT_EVENT_FLAG_OR|RT_EVENT_FLAG_CLEAR), RT_WAITING_FOREVER, &events))
Expand Down Expand Up @@ -433,11 +444,15 @@ void InitPlcCommInfo(rt_uint8_t *pData)
{
plcCommInfo.devType = DEV_TYPE_TS; //TS
}
else
else if(0 == rt_strncmp((char *)plcCommInfo.devInfo,TK,rt_strlen(TK)))
{
plcCommInfo.devType = DEV_TYPE_TK; //TK
}

else
{
plcCommInfo.devType = DEV_TYPE_INVALID;
rt_kprintf("Invalid Device\r\n");
}
}

rt_bool_t InitPlcComm(void)
Expand Down

0 comments on commit c0dfeb2

Please sign in to comment.