mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-06 03:27:01 +03:00
Merged with httpd - work in progress
This commit is contained in:
@@ -29,4 +29,4 @@
|
|||||||
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||||
|
|
||||||
</cproject>
|
</cproject>
|
||||||
2
.project
2
.project
@@ -17,4 +17,4 @@
|
|||||||
<nature>org.eclipse.cdt.core.ccnature</nature>
|
<nature>org.eclipse.cdt.core.ccnature</nature>
|
||||||
<nature>com.espressif.idf.core.idfNature</nature>
|
<nature>com.espressif.idf.core.idfNature</nature>
|
||||||
</natures>
|
</natures>
|
||||||
</projectDescription>
|
</projectDescription>
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
suppressions=rO0ABXNyAAxqYXZhLmlvLkZpbGUELaRFDg3k/wMAAUwABHBhdGh0ABJMamF2YS9sYW5nL1N0cmluZzt4cHQAJWNvbXBvbmVudHNcd2lmaS1tYW5hZ2VyXGh0dHBfc2VydmVyLmN3AgBceA\=\=;comparePointers;395\!rO0ABXNyAAxqYXZhLmlvLkZpbGUELaRFDg3k/wMAAUwABHBhdGh0ABJMamF2YS9sYW5nL1N0cmluZzt4cHQAE21haW5cZXNwX2FwcF9tYWluLmN3AgBceA\=\=;comparePointers;176\!rO0ABXNyAAxqYXZhLmlvLkZpbGUELaRFDg3k/wMAAUwABHBhdGh0ABJMamF2YS9sYW5nL1N0cmluZzt4cHQAJ2NvbXBvbmVudHNcdGVsbmV0XGxpYnRlbG5ldFxsaWJ0ZWxuZXQuY3cCAFx4;va_list_usedBeforeStarted;2147483647\!
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.cdt.codan.checkers.errnoreturn=Warning
|
|
||||||
org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false}
|
|
||||||
org.eclipse.cdt.codan.checkers.errreturnvalue=Error
|
|
||||||
org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"}
|
|
||||||
org.eclipse.cdt.codan.checkers.nocommentinside=-Error
|
|
||||||
org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"}
|
|
||||||
org.eclipse.cdt.codan.checkers.nolinecomment=-Error
|
|
||||||
org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"}
|
|
||||||
org.eclipse.cdt.codan.checkers.noreturn=Error
|
|
||||||
org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CStyleCastProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CStyleCastProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"C-Style cast instead of C++ cast\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false,enable_fallthrough_quickfix_param\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CopyrightProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CopyrightProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Lack of copyright information\\")",regex\=>".*Copyright.*"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.DecltypeAutoProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.DecltypeAutoProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid 'decltype(auto)' specifier\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.GotoStatementProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.GotoStatementProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Goto statement used\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MissCaseProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MissCaseProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Missing cases in switch\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MissDefaultProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MissDefaultProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Missing default in switch\\")",defaultWithAllEnums\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UsingInHeaderProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UsingInHeaderProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Using directive in header\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VirtualMethodCallProblem=-Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VirtualMethodCallProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Virtual method call in constructor/destructor\\")"}
|
|
||||||
org.eclipse.cdt.qt.core.qtproblem=Warning
|
|
||||||
org.eclipse.cdt.qt.core.qtproblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>true,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>null}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
idf_component_register( SRC_DIRS .
|
idf_component_register( SRC_DIRS .
|
||||||
INCLUDE_DIRS .
|
INCLUDE_DIRS .
|
||||||
PRIV_REQUIRES json tools newlib console esp_common freertos
|
PRIV_REQUIRES tools newlib console esp_common freertos
|
||||||
REQUIRES nvs_flash
|
REQUIRES nvs_flash json
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,5 +7,6 @@ idf_component_register( SRCS
|
|||||||
platform_console.c
|
platform_console.c
|
||||||
INCLUDE_DIRS .
|
INCLUDE_DIRS .
|
||||||
REQUIRES nvs_flash
|
REQUIRES nvs_flash
|
||||||
PRIV_REQUIRES console tools services spi_flash app_update platform_config vfs pthread wifi-manager platform_config codecs newlib )
|
PRIV_REQUIRES console tools services spi_flash app_update platform_config vfs pthread wifi-manager platform_config newlib telnet display)
|
||||||
target_link_libraries(__idf_platform_console ${build_dir}/esp-idf/$<TARGET_PROPERTY:RECOVERY_PREFIX>/lib$<TARGET_PROPERTY:RECOVERY_PREFIX>.a )
|
target_link_libraries(${COMPONENT_LIB} ${build_dir}/esp-idf/$<TARGET_PROPERTY:RECOVERY_PREFIX>/lib$<TARGET_PROPERTY:RECOVERY_PREFIX>.a )
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
idf_component_register( SRC_DIRS .
|
idf_component_register( SRC_DIRS .
|
||||||
INCLUDE_DIRS .
|
INCLUDE_DIRS .
|
||||||
PRIV_REQUIRES console squeezelite pthread tools platform_config)
|
PRIV_REQUIRES console codecs squeezelite newlib pthread tools platform_config)
|
||||||
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=feof")
|
||||||
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=fdopen")
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
#include "gds_text.h"
|
#include "gds_text.h"
|
||||||
#include "gds_font.h"
|
#include "gds_font.h"
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "cmd_squeezelite.h"
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
pthread_t thread_console;
|
pthread_t thread_console;
|
||||||
static void * console_thread();
|
static void * console_thread();
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
idf_component_register(SRC_DIRS .
|
idf_component_register(SRC_DIRS .
|
||||||
INCLUDE_DIRS .
|
INCLUDE_DIRS .
|
||||||
REQUIRES app_update esp_https_ota
|
REQUIRES app_update esp_https_ota
|
||||||
PRIV_REQUIRES console tools platform_config spi_flash vfs console freertos platform_console
|
PRIV_REQUIRES console tools display services platform_config spi_flash vfs console freertos platform_console
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
#include "esp_err.h"
|
#include "esp_err.h"
|
||||||
#include "tcpip_adapter.h"
|
#include "tcpip_adapter.h"
|
||||||
#include "squeezelite-ota.h"
|
#include "squeezelite-ota.h"
|
||||||
#include "config.h"
|
#include "platform_config.h"
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
@@ -35,6 +35,7 @@
|
|||||||
#include "gds.h"
|
#include "gds.h"
|
||||||
#include "gds_text.h"
|
#include "gds_text.h"
|
||||||
#include "gds_draw.h"
|
#include "gds_draw.h"
|
||||||
|
#include "platform_esp32.h"
|
||||||
|
|
||||||
extern const char * get_certificate();
|
extern const char * get_certificate();
|
||||||
|
|
||||||
@@ -782,9 +783,9 @@ esp_err_t process_recovery_ota(const char * bin_url, char * bin_buffer, uint32_t
|
|||||||
|
|
||||||
esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length)
|
esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length)
|
||||||
{
|
{
|
||||||
#if RECOVERY_APPLICATION
|
if(is_recovery_running){
|
||||||
return process_recovery_ota(bin_url,bin_buffer,length);
|
return process_recovery_ota(bin_url,bin_buffer,length);
|
||||||
#else
|
}
|
||||||
if(!bin_url){
|
if(!bin_url){
|
||||||
ESP_LOGE(TAG,"missing URL parameter. Unable to start OTA");
|
ESP_LOGE(TAG,"missing URL parameter. Unable to start OTA");
|
||||||
return ESP_ERR_INVALID_ARG;
|
return ESP_ERR_INVALID_ARG;
|
||||||
@@ -802,5 +803,5 @@ esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length)
|
|||||||
ESP_LOGW(TAG, "Rebooting to recovery to complete the installation");
|
ESP_LOGW(TAG, "Rebooting to recovery to complete the installation");
|
||||||
return guided_factory();
|
return guided_factory();
|
||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
// tasks
|
// tasks
|
||||||
#define OTA_TASK_PRIOTITY 6
|
#define OTA_TASK_PRIOTITY 6
|
||||||
|
|
||||||
esp_err_t start_ota(const char * bin_url);
|
|
||||||
const char * ota_get_status();
|
const char * ota_get_status();
|
||||||
uint8_t ota_get_pct_complete();
|
uint8_t ota_get_pct_complete();
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
idf_component_register( SRC_DIRS . external a1s tas57xx
|
idf_component_register( SRC_DIRS . external a1s tas57xx
|
||||||
INCLUDE_DIRS . a1s
|
INCLUDE_DIRS . a1s
|
||||||
PRIV_REQUIRES newlib
|
PRIV_REQUIRES
|
||||||
|
codecs
|
||||||
|
newlib
|
||||||
esp_common
|
esp_common
|
||||||
esp-dsp
|
esp-dsp
|
||||||
platform_config
|
platform_config
|
||||||
bluetooth
|
bluetooth
|
||||||
codecs
|
|
||||||
services
|
services
|
||||||
raop
|
raop
|
||||||
display
|
display
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
idf_component_register( SRC_DIRS .
|
idf_component_register( SRC_DIRS .
|
||||||
INCLUDE_DIRS .
|
INCLUDE_DIRS . ${IDF_PATH}/components/esp_http_server/src ${IDF_PATH}/components/esp_http_server/src/port/esp32 ${IDF_PATH}/components/esp_http_server/src/util ${IDF_PATH}/components/esp_http_server/src/
|
||||||
REQUIRES squeezelite-ota json mdns
|
REQUIRES squeezelite-ota json mdns
|
||||||
PRIV_REQUIRES tools services platform_config esp_common json newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant platform_console
|
PRIV_REQUIRES tools services platform_config esp_common json newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant platform_console esp_http_server
|
||||||
EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
|
EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ function to process requests, decode URLs, serve files, etc. etc.
|
|||||||
#include "esp_system.h"
|
#include "esp_system.h"
|
||||||
#include "freertos/FreeRTOS.h"
|
#include "freertos/FreeRTOS.h"
|
||||||
#include "freertos/task.h"
|
#include "freertos/task.h"
|
||||||
#include "config.h"
|
#include "platform_config.h"
|
||||||
#include "sys/param.h"
|
#include "sys/param.h"
|
||||||
#include "esp_vfs.h"
|
#include "esp_vfs.h"
|
||||||
#include "lwip/ip_addr.h"
|
#include "lwip/ip_addr.h"
|
||||||
@@ -663,11 +663,13 @@ esp_err_t config_post_handler(httpd_req_t *req){
|
|||||||
cJSON_Delete(root);
|
cJSON_Delete(root);
|
||||||
if(bOTA) {
|
if(bOTA) {
|
||||||
|
|
||||||
#if RECOVERY_APPLICATION
|
if(is_recovery_running){
|
||||||
ESP_LOGW_LOC(TAG, "Starting process OTA for url %s",otaURL);
|
ESP_LOGW_LOC(TAG, "Starting process OTA for url %s",otaURL);
|
||||||
#else
|
}
|
||||||
ESP_LOGW_LOC(TAG, "Restarting system to process OTA for url %s",otaURL);
|
else {
|
||||||
#endif
|
ESP_LOGW_LOC(TAG, "Restarting system to process OTA for url %s",otaURL);
|
||||||
|
}
|
||||||
|
|
||||||
wifi_manager_reboot_ota(otaURL);
|
wifi_manager_reboot_ota(otaURL);
|
||||||
free(otaURL);
|
free(otaURL);
|
||||||
}
|
}
|
||||||
@@ -805,82 +807,83 @@ esp_err_t recovery_post_handler(httpd_req_t *req){
|
|||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if RECOVERY_APPLICATION
|
|
||||||
esp_err_t flash_post_handler(httpd_req_t *req){
|
esp_err_t flash_post_handler(httpd_req_t *req){
|
||||||
ESP_LOGD_LOC(TAG, "serving [%s]", req->uri);
|
esp_err_t err =ESP_OK;
|
||||||
char success[]="File uploaded. Flashing started.";
|
if(is_recovery_running){
|
||||||
if(!is_user_authenticated(req)){
|
ESP_LOGD_LOC(TAG, "serving [%s]", req->uri);
|
||||||
// todo: redirect to login page
|
char success[]="File uploaded. Flashing started.";
|
||||||
// return ESP_OK;
|
if(!is_user_authenticated(req)){
|
||||||
}
|
// todo: redirect to login page
|
||||||
esp_err_t err = httpd_resp_set_type(req, HTTPD_TYPE_TEXT);
|
// return ESP_OK;
|
||||||
if(err != ESP_OK){
|
}
|
||||||
return err;
|
err = httpd_resp_set_type(req, HTTPD_TYPE_TEXT);
|
||||||
}
|
if(err != ESP_OK){
|
||||||
char * binary_buffer = malloc(req->content_len);
|
return err;
|
||||||
if(binary_buffer == NULL){
|
}
|
||||||
ESP_LOGE(TAG, "File too large : %d bytes", req->content_len);
|
char * binary_buffer = malloc(req->content_len);
|
||||||
/* Respond with 400 Bad Request */
|
if(binary_buffer == NULL){
|
||||||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST,
|
ESP_LOGE(TAG, "File too large : %d bytes", req->content_len);
|
||||||
"Binary file too large. Unable to allocate memory!");
|
/* Respond with 400 Bad Request */
|
||||||
return ESP_FAIL;
|
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST,
|
||||||
}
|
"Binary file too large. Unable to allocate memory!");
|
||||||
ESP_LOGI(TAG, "Receiving ota binary file");
|
return ESP_FAIL;
|
||||||
/* Retrieve the pointer to scratch buffer for temporary storage */
|
}
|
||||||
char *buf = ((rest_server_context_t *)(req->user_ctx))->scratch;
|
ESP_LOGI(TAG, "Receiving ota binary file");
|
||||||
|
/* Retrieve the pointer to scratch buffer for temporary storage */
|
||||||
|
char *buf = ((rest_server_context_t *)(req->user_ctx))->scratch;
|
||||||
|
|
||||||
char *head=binary_buffer;
|
char *head=binary_buffer;
|
||||||
int received;
|
int received;
|
||||||
|
|
||||||
/* Content length of the request gives
|
/* Content length of the request gives
|
||||||
* the size of the file being uploaded */
|
* the size of the file being uploaded */
|
||||||
int remaining = req->content_len;
|
int remaining = req->content_len;
|
||||||
|
|
||||||
while (remaining > 0) {
|
while (remaining > 0) {
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Remaining size : %d", remaining);
|
ESP_LOGI(TAG, "Remaining size : %d", remaining);
|
||||||
/* Receive the file part by part into a buffer */
|
/* Receive the file part by part into a buffer */
|
||||||
if ((received = httpd_req_recv(req, buf, MIN(remaining, SCRATCH_BUFSIZE))) <= 0) {
|
if ((received = httpd_req_recv(req, buf, MIN(remaining, SCRATCH_BUFSIZE))) <= 0) {
|
||||||
if (received == HTTPD_SOCK_ERR_TIMEOUT) {
|
if (received == HTTPD_SOCK_ERR_TIMEOUT) {
|
||||||
/* Retry if timeout occurred */
|
/* Retry if timeout occurred */
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
FREE_RESET(binary_buffer);
|
||||||
|
ESP_LOGE(TAG, "File reception failed!");
|
||||||
|
/* Respond with 500 Internal Server Error */
|
||||||
|
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to receive file");
|
||||||
|
err = ESP_FAIL;
|
||||||
|
goto bail_out;
|
||||||
}
|
}
|
||||||
FREE_RESET(binary_buffer);
|
|
||||||
ESP_LOGE(TAG, "File reception failed!");
|
/* Write buffer content to file on storage */
|
||||||
/* Respond with 500 Internal Server Error */
|
if (received ) {
|
||||||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to receive file");
|
memcpy(head,buf,received );
|
||||||
err = ESP_FAIL;
|
head+=received;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Keep track of remaining size of
|
||||||
|
* the file left to be uploaded */
|
||||||
|
remaining -= received;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Close file upon upload completion */
|
||||||
|
ESP_LOGI(TAG, "File reception complete. Invoking OTA process.");
|
||||||
|
err = start_ota(NULL, binary_buffer, req->content_len);
|
||||||
|
if(err!=ESP_OK){
|
||||||
|
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "OTA processing failed");
|
||||||
goto bail_out;
|
goto bail_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Write buffer content to file on storage */
|
//todo: handle this in ajax. For now, just send the root page
|
||||||
if (received ) {
|
httpd_resp_send(req, (const char *)success, strlen(success));
|
||||||
memcpy(head,buf,received );
|
|
||||||
head+=received;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Keep track of remaining size of
|
|
||||||
* the file left to be uploaded */
|
|
||||||
remaining -= received;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Close file upon upload completion */
|
|
||||||
ESP_LOGI(TAG, "File reception complete. Invoking OTA process.");
|
|
||||||
err = start_ota(NULL, binary_buffer, req->content_len);
|
|
||||||
if(err!=ESP_OK){
|
|
||||||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "OTA processing failed");
|
|
||||||
goto bail_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
//todo: handle this in ajax. For now, just send the root page
|
|
||||||
httpd_resp_send(req, (const char *)success, strlen(success));
|
|
||||||
|
|
||||||
bail_out:
|
bail_out:
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
char * get_ap_ip_address(){
|
char * get_ap_ip_address(){
|
||||||
static char ap_ip_address[IP4ADDR_STRLEN_MAX]={};
|
static char ap_ip_address[IP4ADDR_STRLEN_MAX]={};
|
||||||
|
|
||||||
|
|||||||
@@ -88,9 +88,7 @@ esp_err_t connect_delete_handler(httpd_req_t *req);
|
|||||||
esp_err_t reboot_ota_post_handler(httpd_req_t *req);
|
esp_err_t reboot_ota_post_handler(httpd_req_t *req);
|
||||||
esp_err_t reboot_post_handler(httpd_req_t *req);
|
esp_err_t reboot_post_handler(httpd_req_t *req);
|
||||||
esp_err_t recovery_post_handler(httpd_req_t *req);
|
esp_err_t recovery_post_handler(httpd_req_t *req);
|
||||||
#if RECOVERY_APPLICATION
|
|
||||||
esp_err_t flash_post_handler(httpd_req_t *req);
|
esp_err_t flash_post_handler(httpd_req_t *req);
|
||||||
#endif
|
|
||||||
esp_err_t status_get_handler(httpd_req_t *req);
|
esp_err_t status_get_handler(httpd_req_t *req);
|
||||||
esp_err_t messages_get_handler(httpd_req_t *req);
|
esp_err_t messages_get_handler(httpd_req_t *req);
|
||||||
|
|
||||||
@@ -111,13 +109,13 @@ typedef struct rest_server_context {
|
|||||||
* @brief RTOS task for the HTTP server. Do not start manually.
|
* @brief RTOS task for the HTTP server. Do not start manually.
|
||||||
* @see void http_server_start()
|
* @see void http_server_start()
|
||||||
*/
|
*/
|
||||||
void CODE_RAM_LOCATION http_server(void *pvParameters);
|
void http_server(void *pvParameters);
|
||||||
|
|
||||||
/* @brief helper function that processes one HTTP request at a time */
|
/* @brief helper function that processes one HTTP request at a time */
|
||||||
void CODE_RAM_LOCATION http_server_netconn_serve(struct netconn *conn);
|
void http_server_netconn_serve(struct netconn *conn);
|
||||||
|
|
||||||
/* @brief create the task for the http server */
|
/* @brief create the task for the http server */
|
||||||
esp_err_t CODE_RAM_LOCATION http_server_start();
|
esp_err_t http_server_start();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief gets a char* pointer to the first occurence of header_name withing the complete http request request.
|
* @brief gets a char* pointer to the first occurence of header_name withing the complete http request request.
|
||||||
@@ -130,9 +128,9 @@ esp_err_t CODE_RAM_LOCATION http_server_start();
|
|||||||
* @param len the size of the header value if found.
|
* @param len the size of the header value if found.
|
||||||
* @return pointer to the beginning of the header value.
|
* @return pointer to the beginning of the header value.
|
||||||
*/
|
*/
|
||||||
char* CODE_RAM_LOCATION http_server_get_header(char *request, char *header_name, int *len);
|
char* http_server_get_header(char *request, char *header_name, int *len);
|
||||||
|
|
||||||
void CODE_RAM_LOCATION strreplace(char *src, char *str, char *rep);
|
void strreplace(char *src, char *str, char *rep);
|
||||||
/* @brief lock the json config object */
|
/* @brief lock the json config object */
|
||||||
bool http_server_lock_json_object(TickType_t xTicksToWait);
|
bool http_server_lock_json_object(TickType_t xTicksToWait);
|
||||||
/* @brief unlock the json config object */
|
/* @brief unlock the json config object */
|
||||||
|
|||||||
@@ -1440,7 +1440,7 @@ void wifi_manager( void * pvParameters ){
|
|||||||
break;
|
break;
|
||||||
case ORDER_RESTART_OTA_URL:
|
case ORDER_RESTART_OTA_URL:
|
||||||
ESP_LOGD(TAG, "Calling start_ota.");
|
ESP_LOGD(TAG, "Calling start_ota.");
|
||||||
start_ota(msg.param);
|
start_ota(msg.param, NULL, 0);
|
||||||
free(msg.param);
|
free(msg.param);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -42,17 +42,6 @@ extern "C" {
|
|||||||
#include "squeezelite-ota.h"
|
#include "squeezelite-ota.h"
|
||||||
#include "cJSON.h"
|
#include "cJSON.h"
|
||||||
|
|
||||||
#ifndef RECOVERY_APPLICATION
|
|
||||||
#error "RECOVERY_APPLICATION not defined. Defaulting to squeezelite"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if RECOVERY_APPLICATION==1
|
|
||||||
#elif RECOVERY_APPLICATION==0
|
|
||||||
#else
|
|
||||||
#error "unknown configuration"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Defines the maximum size of a SSID name. 32 is IEEE standard.
|
* @brief Defines the maximum size of a SSID name. 32 is IEEE standard.
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
#include "freertos/task.h"
|
#include "freertos/task.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "messaging.h"
|
#include "messaging.h"
|
||||||
|
#include "platform_esp32.h"
|
||||||
static const char TAG[] = "http_server";
|
static const char TAG[] = "http_server";
|
||||||
|
|
||||||
static httpd_handle_t _server = NULL;
|
static httpd_handle_t _server = NULL;
|
||||||
@@ -74,13 +75,10 @@ void register_regular_handlers(httpd_handle_t server){
|
|||||||
httpd_uri_t connect_delete = { .uri = "/connect.json", .method = HTTP_DELETE, .handler = connect_delete_handler, .user_ctx = rest_context };
|
httpd_uri_t connect_delete = { .uri = "/connect.json", .method = HTTP_DELETE, .handler = connect_delete_handler, .user_ctx = rest_context };
|
||||||
httpd_register_uri_handler(server, &connect_delete);
|
httpd_register_uri_handler(server, &connect_delete);
|
||||||
|
|
||||||
#if RECOVERY_APPLICATION
|
if(is_recovery_running){
|
||||||
|
httpd_uri_t flash_post = { .uri = "/flash.json", .method = HTTP_POST, .handler = flash_post_handler, .user_ctx = rest_context };
|
||||||
httpd_uri_t flash_post = { .uri = "/flash.json", .method = HTTP_POST, .handler = flash_post_handler, .user_ctx = rest_context };
|
httpd_register_uri_handler(server, &flash_post);
|
||||||
httpd_register_uri_handler(server, &flash_post);
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
// from https://github.com/tripflex/wifi-captive-portal/blob/master/src/mgos_wifi_captive_portal.c
|
// from https://github.com/tripflex/wifi-captive-portal/blob/master/src/mgos_wifi_captive_portal.c
|
||||||
// https://unix.stackexchange.com/questions/432190/why-isnt-androids-captive-portal-detection-triggering-a-browser-window
|
// https://unix.stackexchange.com/questions/432190/why-isnt-androids-captive-portal-detection-triggering-a-browser-window
|
||||||
// Known HTTP GET requests to check for Captive Portal
|
// Known HTTP GET requests to check for Captive Portal
|
||||||
|
|||||||
@@ -76,18 +76,6 @@ const char * str_or_unknown(const char * str) { return (str?str:unknown_string_p
|
|||||||
|
|
||||||
/* brief this is an exemple of a callback that you can setup in your own app to get notified of wifi manager event */
|
/* brief this is an exemple of a callback that you can setup in your own app to get notified of wifi manager event */
|
||||||
void cb_connection_got_ip(void *pvParameter){
|
void cb_connection_got_ip(void *pvParameter){
|
||||||
static ip4_addr_t ip;
|
|
||||||
tcpip_adapter_ip_info_t ipInfo;
|
|
||||||
|
|
||||||
tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ipInfo);
|
|
||||||
if (ip.addr && ipInfo.ip.addr != ip.addr) {
|
|
||||||
ESP_LOGW(TAG, "IP change, need to reboot");
|
|
||||||
if(!wait_for_commit()){
|
|
||||||
ESP_LOGW(TAG,"Unable to commit configuration. ");
|
|
||||||
}
|
|
||||||
esp_restart();
|
|
||||||
}
|
|
||||||
ip.addr = ipInfo.ip.addr;
|
|
||||||
ESP_LOGI(TAG, "I have a connection!");
|
ESP_LOGI(TAG, "I have a connection!");
|
||||||
messaging_post_message(MESSAGING_INFO,MESSAGING_CLASS_SYSTEM,"Wifi connected");
|
messaging_post_message(MESSAGING_INFO,MESSAGING_CLASS_SYSTEM,"Wifi connected");
|
||||||
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
|
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
|
||||||
@@ -442,7 +430,7 @@ void app_main()
|
|||||||
taskYIELD();
|
taskYIELD();
|
||||||
}
|
}
|
||||||
ESP_LOGI(TAG,"Updating firmware from link: %s",fwurl);
|
ESP_LOGI(TAG,"Updating firmware from link: %s",fwurl);
|
||||||
start_ota(fwurl);
|
start_ota(fwurl, NULL, 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ESP_LOGE(TAG,"Restarted to application partition. We're not going to perform OTA!");
|
ESP_LOGE(TAG,"Restarted to application partition. We're not going to perform OTA!");
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
#include($ENV{IDF_PATH}/components/esptool_py/project_include.cmake)
|
||||||
|
|
||||||
if(NOT SDKCONFIG OR NOT IDF_PATH OR NOT IDF_TARGET )
|
if(NOT SDKCONFIG OR NOT IDF_PATH OR NOT IDF_TARGET )
|
||||||
message(FATAL_ERROR "squeezelite should not be made outside of the main project !")
|
message(FATAL_ERROR "squeezelite should not be made outside of the main project !")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user