Merge pull request #1280 from opentx/ChrisNisbet01/issue_1278
Chris nisbet01/issue 1278
This commit is contained in:
+2
-2
@@ -60,7 +60,7 @@ lua_State *L = NULL;
|
|||||||
uint8_t luaState = 0;
|
uint8_t luaState = 0;
|
||||||
uint8_t luaScriptsCount = 0;
|
uint8_t luaScriptsCount = 0;
|
||||||
ScriptInternalData scriptInternalData[MAX_SCRIPTS] = { { SCRIPT_NOFILE, 0 } };
|
ScriptInternalData scriptInternalData[MAX_SCRIPTS] = { { SCRIPT_NOFILE, 0 } };
|
||||||
ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS] = { 0 };
|
ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS] = { {0} };
|
||||||
ScriptInternalData standaloneScript = { SCRIPT_NOFILE, 0 };
|
ScriptInternalData standaloneScript = { SCRIPT_NOFILE, 0 };
|
||||||
uint16_t maxLuaInterval = 0;
|
uint16_t maxLuaInterval = 0;
|
||||||
uint16_t maxLuaDuration = 0;
|
uint16_t maxLuaDuration = 0;
|
||||||
@@ -1379,7 +1379,7 @@ void luaTask(uint8_t evt)
|
|||||||
if (sid.state == SCRIPT_OK) {
|
if (sid.state == SCRIPT_OK) {
|
||||||
uint8_t prev_mem = lua_gc(L, LUA_GCCOUNT, 0);
|
uint8_t prev_mem = lua_gc(L, LUA_GCCOUNT, 0);
|
||||||
SET_LUA_INSTRUCTIONS_COUNT(PERMANENT_SCRIPTS_MAX_INSTRUCTIONS);
|
SET_LUA_INSTRUCTIONS_COUNT(PERMANENT_SCRIPTS_MAX_INSTRUCTIONS);
|
||||||
const char *filename;
|
const char *filename __attribute__((unused));
|
||||||
ScriptInputsOutputs * sio = NULL;
|
ScriptInputsOutputs * sio = NULL;
|
||||||
if (sid.reference >= SCRIPT_MIX_FIRST && sid.reference <= SCRIPT_MIX_LAST) {
|
if (sid.reference >= SCRIPT_MIX_FIRST && sid.reference <= SCRIPT_MIX_LAST) {
|
||||||
ScriptData & sd = g_model.scriptsData[sid.reference-SCRIPT_MIX_FIRST];
|
ScriptData & sd = g_model.scriptsData[sid.reference-SCRIPT_MIX_FIRST];
|
||||||
|
|||||||
+2
-2
@@ -1961,7 +1961,7 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
|
|||||||
if(pdev->cfg.low_power)
|
if(pdev->cfg.low_power)
|
||||||
{
|
{
|
||||||
/* un-gate USB Core clock */
|
/* un-gate USB Core clock */
|
||||||
power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
|
power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
|
||||||
power.b.gatehclk = 0;
|
power.b.gatehclk = 0;
|
||||||
power.b.stoppclk = 0;
|
power.b.stoppclk = 0;
|
||||||
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
||||||
@@ -1995,7 +1995,7 @@ void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
|
|||||||
if(dsts.b.suspsts == 1)
|
if(dsts.b.suspsts == 1)
|
||||||
{
|
{
|
||||||
/* un-gate USB Core clock */
|
/* un-gate USB Core clock */
|
||||||
power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
|
power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
|
||||||
power.b.gatehclk = 0;
|
power.b.gatehclk = 0;
|
||||||
power.b.stoppclk = 0;
|
power.b.stoppclk = 0;
|
||||||
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
||||||
|
|||||||
+1
-1
@@ -358,7 +358,7 @@ static uint32_t DCD_HandleResume_ISR(USB_OTG_CORE_HANDLE *pdev)
|
|||||||
if(pdev->cfg.low_power)
|
if(pdev->cfg.low_power)
|
||||||
{
|
{
|
||||||
/* un-gate USB Core clock */
|
/* un-gate USB Core clock */
|
||||||
power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
|
power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
|
||||||
power.b.gatehclk = 0;
|
power.b.gatehclk = 0;
|
||||||
power.b.stoppclk = 0;
|
power.b.stoppclk = 0;
|
||||||
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|
||||||
|
|||||||
@@ -253,7 +253,7 @@ void hapticOff(void);
|
|||||||
#if defined(REVPLUS)
|
#if defined(REVPLUS)
|
||||||
void hapticOn(uint32_t pwmPercent);
|
void hapticOn(uint32_t pwmPercent);
|
||||||
#else
|
#else
|
||||||
void hapticOn();
|
void hapticOn(void);
|
||||||
#define HAPTIC_ON() hapticOn()
|
#define HAPTIC_ON() hapticOn()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user